diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index c368951c03f..fbee60996d4 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -309,7 +309,6 @@ static inline bool validMode(DebuggerStartMode sm)
 {
     switch (sm) {
     case NoStartMode:
-    case AttachTcf:
     case AttachCore:
     case StartRemoteGdb:
         return false;
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 75b15f40420..46058d7f879 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -150,7 +150,6 @@ enum DebuggerStartMode
     StartExternal,         // Start binary found in file system
     AttachExternal,        // Attach to running process by process id
     AttachCrashedExternal, // Attach to crashed process by process id
-    AttachTcf,             // Attach to a running Target Communication Framework agent
     AttachCore,            // Attach to a core file
     AttachToRemote,        // Start and attach to a remote process
     StartRemoteGdb,        // Start gdb itself remotely
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 7d9d159113e..1659c126c02 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -774,6 +774,8 @@ DebuggerEngine *DebuggerRunControlFactory::createEngine
         return createQmlEngine(sp, masterEngine);
     case LldbEngineType:
         return createLldbEngine(sp);
+    default:
+        break;
     }
     *errorMessage = DebuggerRunControl::tr("Unable to create a debugger engine of the type '%1'").
                     arg(_(engineTypeName(et)));