diff --git a/Core/Core.cc b/Core/Core.cc
index 21e06ab35240fff4511109a7662595aefe1dab7c..0a82ecf17c58e630e34a763bada44d81b221ea69 100644
--- a/Core/Core.cc
+++ b/Core/Core.cc
@@ -385,12 +385,11 @@ Core::init() {
   // connect signal to logger
   connect(this,SIGNAL(scriptLog(QString )),newlog,SLOT(slotLog(QString )),Qt::DirectConnection);
 
+  
   // ======================================================================
-  // This connection will tell the plugins, when their Toolbox is active
+  // Set up QtScript Environment
   // ======================================================================
-  ///@todo reimplement
-//   connect(module_list,SIGNAL(currentChanged(int)),this,SLOT(slotToolboxSwitched(int)));
-
+  
   // Set a reference to the scriptengine for simple rpc calls
   RPC::setScriptEngine(&scriptEngine_);
 
diff --git a/Core/Core.hh b/Core/Core.hh
index 507f98ce3d37a833930227ee73a460f5306e2fba..e6dc8188ef20e9cc8289fa02e769269805d57da2 100644
--- a/Core/Core.hh
+++ b/Core/Core.hh
@@ -553,9 +553,6 @@ private:
       /// Gets called by examiner widget when Wheel is moved in picking mode
       void slotWheelEvent( QWheelEvent * _event, const std::string & _mode);
 
-      /// The current Toolbox item has changed
-//       void slotToolboxSwitched(int _index);
-
       /// Slot adding empty object from Menu
       void slotAddEmptyObjectMenu();
 
diff --git a/Core/PluginCommunication.cc b/Core/PluginCommunication.cc
index eb0a67b118104c45e3de2841544f855ad16dbd9f..5834a9a708f4cb35aab526ea18af6eefd03f2831 100644
--- a/Core/PluginCommunication.cc
+++ b/Core/PluginCommunication.cc
@@ -138,33 +138,6 @@ void Core::slotObjectPropertiesChanged( int _id )
   emit objectPropertiesChanged(_id);
 }
 
-//====================================================================================
-// ===             Toolbox handling                                   =================
-//=====================================================================================
-
- /** If the Toolbox is switched the toolboxActivated function of the each plugin that has a toolbox is called by this function.
-  */
-// void
-// Core::slotToolboxSwitched(int _index)
-// {
-//    // Check all plugins
-//    for ( uint i = 0 ; i < plugins.size(); ++i) {
-//       if (plugins[i].toolboxindex == -1)
-//          continue;
-//
-//       ToolboxInterface* toolboxPlugin = qobject_cast< ToolboxInterface * >(plugins[i].plugin);
-//       if (! toolboxPlugin)
-//          continue;
-//
-//       // Call the corresponding function of the plugins
-//       if ( _index == plugins[i].toolboxindex ) {
-//            toolboxPlugin->toolboxActivated(true);
-//       } else {
-//            toolboxPlugin->toolboxActivated(false);
-//       }
-//    }
-// }
-
 //========================================================================================
 // ===             Texture Communication                       ===========================
 //========================================================================================