diff --git a/Modules/Core/include/mitkInteractionSchemeSwitcher.h b/Modules/Core/include/mitkInteractionSchemeSwitcher.h
index 1d1fe45713..139d6f0738 100644
--- a/Modules/Core/include/mitkInteractionSchemeSwitcher.h
+++ b/Modules/Core/include/mitkInteractionSchemeSwitcher.h
@@ -1,125 +1,116 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #ifndef MITKINTERACTIONSCHEMESWITCHER_H
 #define MITKINTERACTIONSCHEMESWITCHER_H
 
 #include "MitkCoreExports.h"
 
 #include "mitkInteractionEventHandler.h"
 
 #include <itkObject.h>
 
 namespace mitk
 {
   /***********************************************************************
   *
   * \brief Class that offers a convenient way to switch between different
   * interaction schemes.
   *
   * This class offers the possibility to switch between the different
   * interaction schemes that are available:
   *
   * - MITKStandard : The original MITK interaction scheme
   * - MITKRotationUncoupled : A modified MITK interaction scheme with rotation
   * - MITKRotationCoupled : A modified MTIK interaction scheme with coupled rotation
   * - MITKSwivel : A modified MITK interaction scheme with plane swiveling
   *
   * - PACS : An alternative interaction scheme that behaves more like a
   *          PACS workstation
   *   - left mouse button   : behavior depends on current PACS scheme
   *   Always enabled:
   *   - middle mouse button : fast scrolling
   *   - right mouse button  : level-window
   *   - ctrl + right button : zooming
   *   - shift+ right button : panning
   *
   *   There are 6 different PACS schemes.
   *   Each scheme defines the interaction that is performed on a left
   *   mouse button click:
   *   - PACSBase : No interaction on a left mouse button click
         - This scheme serves as a base for other PACS schemes and defines the right
           and middle mouse button clicks, which are available in every PACS scheme.
   *   - PACSStandard : Sets the cross position for the MPR
   *   - PACSLevelWindow : Sets the level window
   *   - PACSPan : Moves the slice
   *   - PACSScroll : Scrolls through the slices stepwise
   *   - PACSZoom : Zooms into / out of the slice
   *
   * When the interaction scheme is changed, this class sets the corresponding
   * interaction .xml-files for a given interaction event handler.
   *
   ***********************************************************************/
+
   class MITKCORE_EXPORT InteractionSchemeSwitcher : public itk::Object
   {
   public:
 #pragma GCC visibility push(default)
     /**
       \brief Can be observed by GUI class to update button states when type is changed programmatically.
     */
     itkEventMacro(InteractionSchemeChangedEvent, itk::AnyEvent);
 #pragma GCC visibility pop
 
     mitkClassMacroItkParent(InteractionSchemeSwitcher, itk::Object);
     itkFactorylessNewMacro(Self);
-    itkCloneMacro(Self);
 
     // enum of the different interaction schemes that are available
     enum InteractionScheme
     {
       MITKStandard = 0,
       MITKRotationUncoupled,
       MITKRotationCoupled,
       MITKSwivel,
       PACSBase,
       PACSStandard,
       PACSLevelWindow,
       PACSPan,
       PACSScroll,
       PACSZoom
     };
 
     /**
     * @brief Set the current interaction scheme of the given interaction event handler
     *
     *        The interaction event handler is able to accept xml-configuration files that will define the interaction scheme.
     *        Based on the given interaction scheme different configuration files are loaded into the interaction event handler.
     *        The interaction scheme can be a variant of the MITK-scheme or the PACS-scheme (see 'enum InteractionScheme').
     *        The default is 'MITKStandard'.
     *        If the interaction scheme has been changed, an 'InteractionSchemeChangedEvent' will be invoked.
     *
     * @pre    The interaction event handler has to be valid (!nullptr).
     * @throw  mitk::Exception, if the interaction event handler is invalid (==nullptr).
     *
     * @param interactionEventHandler  The interaction event handler that defines the interaction scheme via configuration files
     * @param interactionScheme        The interaction scheme that should be used for the currently active interaction event handler.
     */
     void SetInteractionScheme(mitk::InteractionEventHandler* interactionEventHandler, InteractionScheme interactionScheme);
-    /**
-    * @brief Return the current interaction scheme
-    *
-    * @return The currently set InteractionScheme
-    */
-    InteractionScheme GetInteractionScheme() const { return m_InteractionScheme; };
 
   protected:
 
     InteractionSchemeSwitcher();
     ~InteractionSchemeSwitcher() override;
 
-  private:
-
-    InteractionScheme m_InteractionScheme;
   };
 } // namespace mitk
 
 #endif // MITKINTERACTIONSCHEMESWITCHER_H
diff --git a/Modules/Core/src/Interactions/mitkInteractionSchemeSwitcher.cpp b/Modules/Core/src/Interactions/mitkInteractionSchemeSwitcher.cpp
index 5de7de8a5f..0b104903dc 100644
--- a/Modules/Core/src/Interactions/mitkInteractionSchemeSwitcher.cpp
+++ b/Modules/Core/src/Interactions/mitkInteractionSchemeSwitcher.cpp
@@ -1,108 +1,102 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "mitkInteractionSchemeSwitcher.h"
 
-// us
-#include <usGetModuleContext.h>
-#include <usModuleContext.h>
-
 // mitk core
 #include <mitkInteractionEventObserver.h>
 #include <mitkExceptionMacro.h>
 
 mitk::InteractionSchemeSwitcher::InteractionSchemeSwitcher()
-  : m_InteractionScheme(MITKStandard)
 {
   // nothing here
 }
 
 mitk::InteractionSchemeSwitcher::~InteractionSchemeSwitcher()
 {
   // nothing here
 }
 
-void mitk::InteractionSchemeSwitcher::SetInteractionScheme(mitk::InteractionEventHandler* interactionEventHandler, InteractionScheme interactionScheme)
+void mitk::InteractionSchemeSwitcher::SetInteractionScheme(InteractionEventHandler* interactionEventHandler, InteractionScheme interactionScheme)
 {
   if (nullptr == interactionEventHandler)
   {
     mitkThrow() << "Not a valid interaction event handler to set the interaction scheme.";
   }
 
   switch (interactionScheme)
   {
     // MITK MODE
     case MITKStandard:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigMITK.xml");
       break;
     }
     case MITKRotationUncoupled:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigMITKRotationUnCoupled.xml");
       break;
     }
     case MITKRotationCoupled:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigMITKRotation.xml");
       break;
     }
     case MITKSwivel:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigMITKSwivel.xml");
       break;
     }
     // PACS MODE
     case PACSBase:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigPACS.xml");
       break;
     }
     case PACSStandard:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigPACS.xml");
       interactionEventHandler->AddEventConfig("DisplayConfigPACSCrosshair.xml");
       break;
     }
     case PACSLevelWindow:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigPACS.xml");
       interactionEventHandler->AddEventConfig("DisplayConfigPACSLevelWindow.xml");
       break;
     }
     case PACSPan:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigPACS.xml");
       interactionEventHandler->AddEventConfig("DisplayConfigPACSPan.xml");
       break;
     }
     case PACSScroll:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigPACS.xml");
       interactionEventHandler->AddEventConfig("DisplayConfigPACSScroll.xml");
       break;
     }
     case PACSZoom:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigPACS.xml");
       interactionEventHandler->AddEventConfig("DisplayConfigPACSZoom.xml");
       break;
     }
     default:
     {
       interactionEventHandler->SetEventConfig("DisplayConfigMITK.xml");
     }
   }
 
-  m_InteractionScheme = interactionScheme;
   InvokeEvent(InteractionSchemeChangedEvent());
 }