diff --git a/Modules/IGT/DataManagement/mitkTrackingDeviceTypeCollection.cpp b/Modules/IGT/DataManagement/mitkTrackingDeviceTypeCollection.cpp
index 133b11cb51..d81b497f12 100644
--- a/Modules/IGT/DataManagement/mitkTrackingDeviceTypeCollection.cpp
+++ b/Modules/IGT/DataManagement/mitkTrackingDeviceTypeCollection.cpp
@@ -1,120 +1,116 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "mitkTrackingDeviceTypeCollection.h"
-#include "mitkUIDGenerator.h"
 
 #include "mitkUnspecifiedTrackingTypeInformation.h"
 
 //Microservices
 #include <usGetModuleContext.h>
-#include <usModule.h>
-#include <usServiceProperties.h>
 #include <usModuleContext.h>
 
 
 mitk::TrackingDeviceTypeCollection::TrackingDeviceTypeCollection()
   : m_TrackingDeviceTypeInformations()
 {
 }
 
 mitk::TrackingDeviceTypeCollection::~TrackingDeviceTypeCollection()
 {
 }
 
 void mitk::TrackingDeviceTypeCollection::RegisterAsMicroservice()
 {
-  // Get Context
   us::ModuleContext* context = us::GetModuleContext();
 
   m_ServiceRegistration = context->RegisterService(this);
 }
 
 void mitk::TrackingDeviceTypeCollection::UnRegisterMicroservice()
 {
-  if (m_ServiceRegistration != NULL) m_ServiceRegistration.Unregister();
+  if (m_ServiceRegistration != nullptr) m_ServiceRegistration.Unregister();
   m_ServiceRegistration = 0;
 }
 
 void mitk::TrackingDeviceTypeCollection::RegisterTrackingDeviceType(TrackingDeviceTypeInformation* typeInformation)
 {
   if (typeInformation != nullptr)
   {
     m_TrackingDeviceTypeInformations.push_back(typeInformation);
   }
 }
 
 mitk::TrackingDeviceTypeInformation* mitk::TrackingDeviceTypeCollection::GetTrackingDeviceTypeInformation(mitk::TrackingDeviceType type)
 {
   for (auto deviceType : m_TrackingDeviceTypeInformations)
   {
     if (deviceType->GetTrackingDeviceName() == type)
     {
       return deviceType;
     }
   }
 
   return nullptr;
 }
 
 std::vector<mitk::TrackingDeviceData> mitk::TrackingDeviceTypeCollection::GetDeviceDataForLine(TrackingDeviceType type)
 {
   for (auto deviceType : m_TrackingDeviceTypeInformations)
   {
     if (deviceType->GetTrackingDeviceName() == type)
     {
       return deviceType->m_TrackingDeviceData;
     }
   }
 
   return std::vector<TrackingDeviceData>();
 }
 
 mitk::TrackingDeviceData mitk::TrackingDeviceTypeCollection::GetFirstCompatibleDeviceDataForLine(TrackingDeviceType type)
 {
   if (GetDeviceDataForLine(type).empty())
   {
     return mitk::UnspecifiedTrackingTypeInformation::GetDeviceDataInvalid();
   }
 
   return GetDeviceDataForLine(type).front();
 }
 
 mitk::TrackingDeviceData mitk::TrackingDeviceTypeCollection::GetDeviceDataByName(const std::string& modelName)
 {
   for (auto deviceType : m_TrackingDeviceTypeInformations)
   {
     for (auto deviceData : deviceType->m_TrackingDeviceData)
     {
       if (deviceData.Model == modelName)
       {
         return deviceData;
       }
     }
   }
 
   return mitk::UnspecifiedTrackingTypeInformation::GetDeviceDataInvalid();
 }
 
 std::vector<std::string> mitk::TrackingDeviceTypeCollection::GetTrackingDeviceTypeNames()
 {
   std::vector<std::string> names;
   for (auto deviceType : m_TrackingDeviceTypeInformations)
   {
     names.push_back(deviceType->GetTrackingDeviceName());
   }
   return names;
 }