diff --git a/Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.cpp b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.cpp
index 61f852b699..5d51c6255e 100644
--- a/Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.cpp
+++ b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.cpp
@@ -1,46 +1,30 @@
-/*=========================================================================
+/*===================================================================
 
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date$
-Version:   $Revision$
+The Medical Imaging Interaction Toolkit (MITK)
 
-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.
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
 
-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.
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
 
-=========================================================================*/
+See LICENSE.txt or http://www.mitk.org for details.
 
-#include <mitkBoundingShapeObjectFactory.h>
-#include "org_mitk_gui_qt_imagecropper_Activator.h"
+===================================================================*/
 
-#include <QtPlugin>
+#include <mitkBoundingShapeObjectFactory.h>
 
+#include "org_mitk_gui_qt_imagecropper_Activator.h"
 #include "QmitkImageCropper.h"
-#include <usModuleInitialization.h>
-#include <usGetModuleContext.h>
-
-US_INITIALIZE_MODULE
-
-namespace mitk {
-
-  void org_mitk_gui_qt_imagecropper_Activator::start(ctkPluginContext* context)
-  {
-    RegisterBoundingShapeObjectFactory();
-    BERRY_REGISTER_EXTENSION_CLASS(QmitkImageCropper, context)
-  }
-
-  void org_mitk_gui_qt_imagecropper_Activator::stop(ctkPluginContext* context)
-  {
-    Q_UNUSED(context)
-  }
 
+void mitk::org_mitk_gui_qt_imagecropper_Activator::start(ctkPluginContext* context)
+{
+  RegisterBoundingShapeObjectFactory();
+  BERRY_REGISTER_EXTENSION_CLASS(QmitkImageCropper, context)
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(org_mitk_gui_qt_imagecropper, mitk::PluginActivator)
-#endif
\ No newline at end of file
+void mitk::org_mitk_gui_qt_imagecropper_Activator::stop(ctkPluginContext*)
+{
+}
diff --git a/Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.h b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.h
index b271d44e65..88f376cbe3 100644
--- a/Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.h
+++ b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.h
@@ -1,42 +1,36 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
+
 #ifndef org_mitk_gui_qt_imagecropper_Activator_h
 #define org_mitk_gui_qt_imagecropper_Activator_h
 
 #include <ctkPluginActivator.h>
 
-namespace mitk {
-
-  class org_mitk_gui_qt_imagecropper_Activator :
-  public QObject, public ctkPluginActivator
+namespace mitk
 {
-  Q_OBJECT
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+  class org_mitk_gui_qt_imagecropper_Activator : public QObject, public ctkPluginActivator
+  {
+    Q_OBJECT
     Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_imagecropper")
-#endif
     Q_INTERFACES(ctkPluginActivator)
 
-public:
-
-  void start(ctkPluginContext* context) override;
-  void stop(ctkPluginContext* context) override;
-
-}; // PluginActivator
-
+  public:
+    void start(ctkPluginContext* context) override;
+    void stop(ctkPluginContext* context) override;
+  };
 }
 
-#endif // org_mitk_gui_qt_imagecropper_Activator_h
+#endif