diff --git a/client.cpp b/client.cpp
index cb09c00d90..b785fb0852 100644
--- a/client.cpp
+++ b/client.cpp
@@ -48,7 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFile>
 #include <QMouseEvent>
 #include <QProcess>
-#include <QWhatsThis>
 // XLib
 #include <X11/Xutil.h>
 #include <fixx11h.h>
@@ -1399,7 +1398,6 @@ void Client::showContextHelp()
 {
     if (info->supportsProtocol(NET::ContextHelpProtocol)) {
         sendClientMessage(window(), atoms->wm_protocols, atoms->net_wm_context_help);
-        QWhatsThis::enterWhatsThisMode(); // SELI TODO: ?
     }
 }
 
diff --git a/events.cpp b/events.cpp
index 1770719c9f..462611ba20 100644
--- a/events.cpp
+++ b/events.cpp
@@ -51,7 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QKeyEvent>
 #include <QMouseEvent>
 #include <QStyleHints>
-#include <QWhatsThis>
 #include <QWheelEvent>
 
 #include <kkeyserver.h>
@@ -385,25 +384,10 @@ bool Workspace::workspaceEvent(xcb_generic_event_t *e)
     }
 
     case XCB_ENTER_NOTIFY: {
-        if (QWhatsThis::inWhatsThisMode()) {
-            QWidget* w = QWidget::find(reinterpret_cast<xcb_enter_notify_event_t*>(e)->event);
-            if (w)
-                QWhatsThis::leaveWhatsThisMode();
-        }
         if (ScreenEdges::self()->isEntered(reinterpret_cast<xcb_enter_notify_event_t*>(e)))
             return true;
         break;
     }
-    case XCB_LEAVE_NOTIFY: {
-        if (!QWhatsThis::inWhatsThisMode())
-            break;
-        // TODO is this cliente ever found, given that client events are searched above?
-        const auto *event = reinterpret_cast<xcb_leave_notify_event_t*>(e);
-        Client* c = findClient(Predicate::FrameIdMatch, event->event);
-        if (c && event->detail != XCB_NOTIFY_DETAIL_INFERIOR)
-            QWhatsThis::leaveWhatsThisMode();
-        break;
-    }
     case XCB_CONFIGURE_REQUEST: {
         const auto *event = reinterpret_cast<xcb_configure_request_event_t*>(e);
         if (event->parent == rootWindow()) {