diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.h b/src/plugins/debugger/gdb/abstractgdbadapter.h
index 53d49770fada2a2fe010395be6848a913e0c8495..5d0f17360876dde645440d7d5646209cc57f9ee0 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.h
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.h
@@ -55,8 +55,6 @@ public:
     virtual QByteArray readAllStandardError() = 0;
     virtual QByteArray readAllStandardOutput() = 0;
     virtual void write(const QByteArray &data) = 0;
-    virtual void setWorkingDirectory(const QString &dir) = 0;
-    virtual void setEnvironment(const QStringList &env) = 0;
     virtual bool isTrkAdapter() const = 0;
 
     virtual void startAdapter() = 0;
@@ -80,8 +78,6 @@ signals:
     void inferiorShutDown();
     void inferiorShutdownFailed(const QString &msg);
     
-    void inferiorPidChanged(qint64 pid);
-
     void readyReadStandardOutput();
     void readyReadStandardError();
 
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index 391ee2466b6637f27c54d2cf8f5879b2bb8a1440..f70d5bcf05a26222a82c54e9ef58986f726cdf95 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -128,21 +128,6 @@ void AttachGdbAdapter::handleAttach(const GdbResponse &response)
     }
 }
 
-void AttachGdbAdapter::handleContinue(const GdbResponse &response)
-{
-    QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
-    if (response.resultClass == GdbResultRunning) {
-        setState(InferiorRunning);
-        debugMessage(_("INFERIOR STARTED"));
-        showStatusMessage(tr("Inferior running."));
-    } else {
-        QTC_ASSERT(response.resultClass == GdbResultError, /**/);
-        const QByteArray &msg = response.data.findChild("msg").data();
-        setState(InferiorStartFailed);
-        emit inferiorStartFailed(msg);
-    }
-}
-
 void AttachGdbAdapter::interruptInferior()
 {
     debugMessage(_("TRYING TO INTERUPT INFERIOR"));
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.h b/src/plugins/debugger/gdb/attachgdbadapter.h
index 7f9d8d46cca4a193f8043b026b792c25e02f7bbf..c3a30a7705ab105c8cc045df1ea6506397a7512d 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.h
+++ b/src/plugins/debugger/gdb/attachgdbadapter.h
@@ -56,8 +56,6 @@ private:
     QByteArray readAllStandardError() { return m_gdbProc.readAllStandardError(); }
     QByteArray readAllStandardOutput() { return m_gdbProc.readAllStandardOutput(); }
     void write(const QByteArray &data) { m_gdbProc.write(data, data.size()); }
-    void setWorkingDirectory(const QString &dir) { m_gdbProc.setWorkingDirectory(dir); }
-    void setEnvironment(const QStringList &env) { m_gdbProc.setEnvironment(env); }
     bool isTrkAdapter() const { return false; }
     bool dumpersAvailable() const { return false; }
 
@@ -68,7 +66,6 @@ private:
     void shutdown();
 
     void handleAttach(const GdbResponse &response);
-    void handleContinue(const GdbResponse &response);
     void handleDetach(const GdbResponse &response);
     void handleExit(const GdbResponse &response);
 
diff --git a/src/plugins/debugger/gdb/coregdbadapter.h b/src/plugins/debugger/gdb/coregdbadapter.h
index 273891d1337c77350d026d209e39cfd66e1c4a3e..52bcf7a42842959dc6d594084d983f1e90c8c217 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.h
+++ b/src/plugins/debugger/gdb/coregdbadapter.h
@@ -56,8 +56,6 @@ private:
     QByteArray readAllStandardError() { return m_gdbProc.readAllStandardError(); }
     QByteArray readAllStandardOutput() { return m_gdbProc.readAllStandardOutput(); }
     void write(const QByteArray &data) { m_gdbProc.write(data, data.size()); }
-    void setWorkingDirectory(const QString &dir) { m_gdbProc.setWorkingDirectory(dir); }
-    void setEnvironment(const QStringList &env) { m_gdbProc.setEnvironment(env); }
     bool isTrkAdapter() const { return false; }
     bool dumpersAvailable() const { return false; }
 
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index a45787afffb2a3d95be7782000911fed431ab41f..c72b5ea7e4ad3d9da47ead3b24f2cc4d2bac0b04 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -116,9 +116,9 @@ void PlainGdbAdapter::startAdapter()
         gdbArgs.prepend(_("--tty=") + m_engine->m_outputCollector.serverName());
 
         if (!startParameters().workingDir.isEmpty())
-            setWorkingDirectory(startParameters().workingDir);
+            m_gdbProc.setWorkingDirectory(startParameters().workingDir);
         if (!startParameters().environment.isEmpty())
-            setEnvironment(startParameters().environment);
+            m_gdbProc.setEnvironment(startParameters().environment);
     }
 
     m_gdbProc.start(theDebuggerStringSetting(GdbLocation), gdbArgs);
@@ -164,49 +164,6 @@ void PlainGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
     }
 }
 
-void PlainGdbAdapter::handleInfoTarget(const GdbResponse &response)
-{
-    QTC_ASSERT(state() == DebuggerNotReady, qDebug() << state());
-#if defined(Q_OS_MAC)
-    Q_UNUSED(response)
-#else
-/*
-    #ifdef Q_OS_MAC        
-    m_engine->postCommand(_("sharedlibrary apply-load-rules all"));
-    // On MacOS, breaking in at the entry point wreaks havoc.
-    m_engine->postCommand(_("tbreak main"));
-    m_waitingForFirstBreakpointToBeHit = true;
-    m_engine->postCommand(_("-exec-run"), CB(handleExecRun));
-    #else
-// FIXME:
-//    if (!m_dumperInjectionLoad)
-//        m_engine->postCommand(_("set auto-solib-add off"));
-    m_engine->postCommand(_("info target"), CB(handleInfoTarget));
-    #endif
-*/
-    if (response.resultClass == GdbResultDone) {
-        // [some leading stdout here]
-        // >&"        Entry point: 0x80831f0  0x08048134 - 0x08048147 is .interp\n"
-        // [some trailing stdout here]
-        QString msg = _(response.data.findChild("consolestreamoutput").data());
-        QRegExp needle(_("\\bEntry point: (0x[0-9a-f]+)\\b"));
-        if (needle.indexIn(msg) != -1) {
-            //debugMessage(_("STREAM: ") + msg + " " + needle.cap(1));
-            m_engine->postCommand(_("tbreak *") + needle.cap(1));
-// FIXME:            m_waitingForFirstBreakpointToBeHit = true;
-            setState(InferiorRunningRequested);
-            m_engine->postCommand(_("-exec-run"), CB(handleExecRun));
-        } else {
-            debugMessage(_("PARSING START ADDRESS FAILED: ") + msg);
-            emit inferiorStartFailed(_("Parsing start address failed"));
-        }
-    } else if (response.resultClass == GdbResultError) {
-        debugMessage(_("FETCHING START ADDRESS FAILED: " + response.toString()));
-        emit inferiorStartFailed(_("Fetching start address failed"));
-    }
-#endif
-}
-
 void PlainGdbAdapter::handleExecRun(const GdbResponse &response)
 {
     if (response.resultClass == GdbResultRunning) {
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.h b/src/plugins/debugger/gdb/plaingdbadapter.h
index 73a3c8760d704e9453654e869807a08a3f886986..1751847a53612154f4f2d6106216af39cfc91fa4 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.h
+++ b/src/plugins/debugger/gdb/plaingdbadapter.h
@@ -57,8 +57,6 @@ public:
     QByteArray readAllStandardError() { return m_gdbProc.readAllStandardError(); }
     QByteArray readAllStandardOutput() { return m_gdbProc.readAllStandardOutput(); }
     void write(const QByteArray &data) { m_gdbProc.write(data, data.size()); }
-    void setWorkingDirectory(const QString &dir) { m_gdbProc.setWorkingDirectory(dir); }
-    void setEnvironment(const QStringList &env) { m_gdbProc.setEnvironment(env); }
     bool isTrkAdapter() const { return false; }
     bool dumpersAvailable() const { return true; }
 
@@ -74,7 +72,6 @@ private:
     void handleExit(const GdbResponse &response);
     void handleStubAttached(const GdbResponse &response);
     void handleExecRun(const GdbResponse &response);
-    void handleInfoTarget(const GdbResponse &response);
 
     void emitAdapterStartFailed(const QString &msg);
     Q_SLOT void handleGdbFinished(int, QProcess::ExitStatus status);
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.h b/src/plugins/debugger/gdb/remotegdbadapter.h
index 6842e1182969587ab7623f6d93bd0a96ce6c23c0..d45e27fda601e687f08579936a57dc4e9c36107a 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.h
+++ b/src/plugins/debugger/gdb/remotegdbadapter.h
@@ -56,8 +56,6 @@ private:
     QByteArray readAllStandardError() { return m_gdbProc.readAllStandardError(); }
     QByteArray readAllStandardOutput() { return m_gdbProc.readAllStandardOutput(); }
     void write(const QByteArray &data) { m_gdbProc.write(data, data.size()); }
-    void setWorkingDirectory(const QString &dir) { m_gdbProc.setWorkingDirectory(dir); }
-    void setEnvironment(const QStringList &env) { m_gdbProc.setEnvironment(env); }
     bool isTrkAdapter() const { return false; }
     bool dumpersAvailable() const { return true; }
 
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 86c7e6f52783d18ba6a24768da52f706726f506c..f9953f0f2af6c65e09a897c22c7f0d8da6d33199 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -2061,16 +2061,6 @@ void TrkGdbAdapter::handleDirectStep3(const TrkResult &result)
     logMessage("HANDLE DIRECT STEP2: " + stringFromArray(result.data));
 }
 
-void TrkGdbAdapter::setWorkingDirectory(const QString &dir)
-{
-    m_gdbProc.setWorkingDirectory(dir);
-}
-
-void TrkGdbAdapter::setEnvironment(const QStringList &env)
-{
-    m_gdbProc.setEnvironment(env);
-}
-
 void TrkGdbAdapter::cleanup()
 {
     if (m_trkDevice.isOpen())
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.h b/src/plugins/debugger/gdb/trkgdbadapter.h
index b2fe1aee0ca615ff8c3236dfd8ac1441671a4f6c..09ca35e17de72c51281da1053e83f85215d1f614 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.h
+++ b/src/plugins/debugger/gdb/trkgdbadapter.h
@@ -169,8 +169,6 @@ public:
     QByteArray readAllStandardError();
     QByteArray readAllStandardOutput();
     void write(const QByteArray &data);
-    void setWorkingDirectory(const QString &dir);
-    void setEnvironment(const QStringList &env);
     bool isTrkAdapter() const { return true; }
     bool dumpersAvailable() const { return false; }