diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake b/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake
index a3453eeec4..3698e6c548 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake
@@ -1,32 +1,31 @@
 SET(MOC_H_FILES
   src/internal/berryPluginActivator.h
   src/internal/berryPreferencesService.h
 )
 
 SET(SRC_CPP_FILES
   berryIAdaptable.cpp
   berryIAdapterManager.cpp
   berryIPreferencesService.cpp
   berryPlatformObject.cpp
   berryRuntime.cpp
-  berryRuntimePlugin.cpp
   berryBackingStoreException.cpp
 )
 
 SET(INTERNAL_CPP_FILES
   berryAbstractPreferencesStorage.cpp
   berryPluginActivator.cpp
   berryPreferences.cpp
   berryPreferencesService.cpp
   berryXMLPreferencesStorage.cpp
 )
 
 SET(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   SET(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   SET(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntimePlugin.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntimePlugin.cpp
deleted file mode 100644
index ffcd007670..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntimePlugin.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*=========================================================================
- 
-Program:   BlueBerry Platform
-Language:  C++
-Date:      $Date$
-Version:   $Revision$
- 
-Copyright (c) German Cancer Research Center, Division of Medical and
-Biological Informatics. All rights reserved.
-See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
- 
-This software is distributed WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the above copyright notices for more information.
- 
-=========================================================================*/
-
-#include "berryRuntimePlugin.h"
-
-#include "berryPlatform.h"
-#include "service/berryIExtensionPointService.h"
-#include "event/berryPlatformEvents.h"
-
-#include "Poco/Delegate.h"
-
-#include <iostream>
-
-namespace berry {
-
-const std::string RuntimePlugin::PLUGIN_ID = "org.blueberry.core.runtime";
-
-void 
-RuntimePlugin::Start(IBundleContext::Pointer context)
-{
-  //BERRY_INFO << "Runtime plugin activated!\n";
-  
-  //Platform::GetEvents().platformStarted += 
-  //  Poco::Delegate<RuntimePlugin, PlatformEvent>(this, &RuntimePlugin::onPlatformStarted);
-
-  m_PreferencesService = new PreferencesService();
-  context->RegisterService(IPreferencesService::ID, m_PreferencesService);
-}
-
-void
-RuntimePlugin::Stop(IBundleContext::Pointer /*context*/)
-{
-  //BERRY_INFO << "Runtime plugin activated!\n";
-
-  //Platform::GetEvents().platformStarted +=
-  //  Poco::Delegate<RuntimePlugin, PlatformEvent>(this, &RuntimePlugin::onPlatformStarted);
-
-  m_PreferencesService->ShutDown();
-}
-
-}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntimePlugin.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntimePlugin.h
deleted file mode 100644
index 6c6e9a0014..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntimePlugin.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=========================================================================
- 
-Program:   BlueBerry Platform
-Language:  C++
-Date:      $Date$
-Version:   $Revision$
- 
-Copyright (c) German Cancer Research Center, Division of Medical and
-Biological Informatics. All rights reserved.
-See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
- 
-This software is distributed WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the above copyright notices for more information.
- 
-=========================================================================*/
-
-#ifndef BERRYRUNTIMEACTIVATOR_H_
-#define BERRYRUNTIMEACTIVATOR_H_
-
-#include <berryPlugin.h>
-#include <berryIBundleContext.h>
-#include <berryPlatformEvent.h>
-
-#include <org_blueberry_core_runtime_Export.h>
-#include "internal/berryPreferencesService.h"
-
-namespace berry {
-
-class BERRY_RUNTIME RuntimePlugin : public Plugin
-{
-public:
-  
-  static const std::string PLUGIN_ID;
-  
-  void Start(IBundleContext::Pointer context);
-  void Stop(IBundleContext::Pointer context);
-protected:
-  PreferencesService::Pointer m_PreferencesService;
-};
-
-}
-
-#endif /*BERRYRUNTIMEACTIVATOR_H_*/