diff --git a/src/ViewWrapper.h b/src/ViewWrapper.h
index a2e9018b..ec1f6966 100644
--- a/src/ViewWrapper.h
+++ b/src/ViewWrapper.h
@@ -59,12 +59,6 @@ public:
     void render(QPainter *p) override;
     void setMouseTracking(bool) override;
     std::shared_ptr<ViewWrapper> asWrapper() override;
-
-    /// TODOm3: Remove
-    virtual Controllers::DropArea *asDropArea() const
-    {
-        return {};
-    };
 };
 
 bool operator==(ViewWrapper::Ptr, ViewWrapper::Ptr) = delete;
diff --git a/src/controllers/DockWidget.cpp b/src/controllers/DockWidget.cpp
index 6e77bf47..b95e6f4c 100644
--- a/src/controllers/DockWidget.cpp
+++ b/src/controllers/DockWidget.cpp
@@ -244,7 +244,7 @@ QString DockWidget::title() const
 {
     if (d->isMDIWrapper()) {
         // It's just a wrapper to help implementing Option_MDINestable. Return the title of the real dock widget we're hosting.
-        auto dropAreaGuest = d->guest ? guestView()->asDropArea() : nullptr;
+        auto dropAreaGuest = d->guest ? guestView()->asDropAreaController() : nullptr;
         Q_ASSERT(dropAreaGuest);
         if (dropAreaGuest->hasSingleFrame()) {
             return dropAreaGuest->frames().constFirst()->title();
@@ -564,7 +564,7 @@ MDILayout *DockWidget::Private::mdiLayout() const
         if (auto mdiLayout = p->asMDILayoutController()) {
             // And it's MDI
             return mdiLayout;
-        } else if (auto dropArea = p->asDropArea()) {
+        } else if (auto dropArea = p->asDropAreaController()) {
             // It's a DropArea. But maybe it's a drop area that's just helping
             // making the MDI windows accept drops (Option_MDINestable)
             if (!dropArea->isMDIWrapper())
@@ -586,7 +586,7 @@ bool DockWidget::Private::isMDIWrapper() const
 
 DropArea *DockWidget::Private::mdiDropAreaWrapper() const
 {
-    if (auto dropAreaGuest = guest ? q->guestView()->asDropArea() : nullptr) {
+    if (auto dropAreaGuest = guest ? q->guestView()->asDropAreaController() : nullptr) {
         if (dropAreaGuest->isMDIWrapper())
             return dropAreaGuest;
     }
@@ -605,7 +605,7 @@ Controllers::DockWidget *DockWidget::Private::mdiDockWidgetWrapper() const
     while (p) {
 
         if (p->is(Type::DropArea) || p->is(Type::MDILayout)) {
-            if (auto dropArea = p->asDropArea()) {
+            if (auto dropArea = p->asDropAreaController()) {
                 if (dropArea->isMDIWrapper())
                     return dropArea->mdiDockWidgetWrapper();
             }
diff --git a/src/controllers/Frame.cpp b/src/controllers/Frame.cpp
index be0b1d17..12e9c9f0 100644
--- a/src/controllers/Frame.cpp
+++ b/src/controllers/Frame.cpp
@@ -936,7 +936,7 @@ Controllers::DockWidget *Frame::mdiDockWidgetWrapper() const
 DropArea *Frame::mdiDropAreaWrapper() const
 {
     auto p = view()->parentView();
-    auto dropArea = p ? p->asDropArea() : nullptr;
+    auto dropArea = p ? p->asDropAreaController() : nullptr;
     if (dropArea && dropArea->isMDIWrapper())
         return dropArea;
     return nullptr;
diff --git a/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp b/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp
index 099f4774..e3b71f81 100644
--- a/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp
+++ b/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp
@@ -291,13 +291,6 @@ bool ViewWrapper_qtwidgets::isNull() const
     return m_widget.data() == nullptr;
 }
 
-Controllers::DropArea *ViewWrapper_qtwidgets::asDropArea() const
-{
-    if (auto view = qobject_cast<DropArea_qtwidgets *>(m_widget))
-        return view->asDropAreaController();
-    return nullptr;
-}
-
 QWidget *ViewWrapper_qtwidgets::widget() const
 {
     return m_widget;
diff --git a/src/qtwidgets/views/ViewWrapper_qtwidgets.h b/src/qtwidgets/views/ViewWrapper_qtwidgets.h
index 6c0d4757..54fdfb66 100644
--- a/src/qtwidgets/views/ViewWrapper_qtwidgets.h
+++ b/src/qtwidgets/views/ViewWrapper_qtwidgets.h
@@ -57,7 +57,6 @@ public:
     bool isNull() const override;
     void setWindowTitle(const QString &title) override;
     QPoint mapTo(View *, QPoint) const override;
-    Controllers::DropArea *asDropArea() const override;
     bool testAttribute(Qt::WidgetAttribute) const override;
     void setCursor(Qt::CursorShape) override;
     QSize minSize() const override;