diff --git a/Modules/Pharmacokinetics/include/mitkDICOMPMConstants.h b/Modules/Pharmacokinetics/include/mitkDICOMPMConstants.h
index 7fca2d22cb..2b42ec842a 100644
--- a/Modules/Pharmacokinetics/include/mitkDICOMPMConstants.h
+++ b/Modules/Pharmacokinetics/include/mitkDICOMPMConstants.h
@@ -1,74 +1,49 @@
 /*===================================================================
 
 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 MITKDICOMPMCONSTANTS_H_
 #define MITKDICOMPMCONSTANTS_H_
 
 #include <mitkDICOMTagPath.h>
 
 #include <MitkPharmacokineticsExports.h>
 
 
 namespace mitk
 {
   struct MITKPHARMACOKINETICS_EXPORT DICOMPMConstants
   {
-    // IKO
 	static DICOMTagPath RWVM_SEQUENCE_PATH();
 	
 	static DICOMTagPath UNITS_SEQUENCE_PATH();
 	static DICOMTagPath UNITS_CODE_VALUE_PATH();
 	static DICOMTagPath UNITS_CODE_SCHEME_PATH();
 	static DICOMTagPath UNITS_CODE_MEANING_PATH();
 
 	static DICOMTagPath QUANTITY_DEFINITION_SEQUENCE_PATH();
 	static DICOMTagPath QUANTITY_DEFINITION_VALUE_TYPE_PATH();
 	
 	static DICOMTagPath QUANTITY_DEFINITION_CONCEPT_CODE_SEQUENCE_PATH();
 	static DICOMTagPath QUANTITY_DEFINITION_CONCEPT_CODE_VALUE_PATH();
 	static DICOMTagPath QUANTITY_DEFINITION_CONCEPT_CODE_SCHEME_PATH();
 	static DICOMTagPath QUANTITY_DEFINITION_CONCEPT_CODE_MEANING_PATH();
 
-    static DICOMTagPath SEGMENT_SEQUENCE_PATH();
-    static DICOMTagPath SEGMENT_NUMBER_PATH();
-    static DICOMTagPath SEGMENT_LABEL_PATH();
-    static DICOMTagPath SEGMENT_ALGORITHM_TYPE_PATH();
-
-    static DICOMTagPath ANATOMIC_REGION_SEQUENCE_PATH();
-    static DICOMTagPath ANATOMIC_REGION_CODE_VALUE_PATH();
-    static DICOMTagPath ANATOMIC_REGION_CODE_SCHEME_PATH();
-    static DICOMTagPath ANATOMIC_REGION_CODE_MEANING_PATH();
-
-    static DICOMTagPath SEGMENTED_PROPERTY_CATEGORY_SEQUENCE_PATH();
-    static DICOMTagPath SEGMENT_CATEGORY_CODE_VALUE_PATH();
-    static DICOMTagPath SEGMENT_CATEGORY_CODE_SCHEME_PATH();
-    static DICOMTagPath SEGMENT_CATEGORY_CODE_MEANING_PATH();
-
-    static DICOMTagPath SEGMENTED_PROPERTY_TYPE_SEQUENCE_PATH();
-    static DICOMTagPath SEGMENT_TYPE_CODE_VALUE_PATH();
-    static DICOMTagPath SEGMENT_TYPE_CODE_SCHEME_PATH();
-    static DICOMTagPath SEGMENT_TYPE_CODE_MEANING_PATH();
-
-    static DICOMTagPath SEGMENTED_PROPERTY_MODIFIER_SEQUENCE_PATH();
-    static DICOMTagPath SEGMENT_MODIFIER_CODE_VALUE_PATH();
-    static DICOMTagPath SEGMENT_MODIFIER_CODE_SCHEME_PATH();
-    static DICOMTagPath SEGMENT_MODIFIER_CODE_MEANING_PATH();
 
 
   };
 }
 
-#endif // MITKDICOMSEGMENTATIONCONSTANTS_H_
+#endif // MITKDICOMPMCONSTANTS_H_
diff --git a/Modules/Pharmacokinetics/src/Common/mitkDICOMPMConstants.cpp b/Modules/Pharmacokinetics/src/Common/mitkDICOMPMConstants.cpp
index 7fb945dedf..70aa55a2ae 100644
--- a/Modules/Pharmacokinetics/src/Common/mitkDICOMPMConstants.cpp
+++ b/Modules/Pharmacokinetics/src/Common/mitkDICOMPMConstants.cpp
@@ -1,243 +1,69 @@
 /*===================================================================
 
 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 "mitkDICOMPMConstants.h"
 
 namespace mitk
 {
-	// IKO
 	DICOMTagPath DICOMPMConstants::RWVM_SEQUENCE_PATH()
 	{
-		static DICOMTagPath path = DICOMTagPath().AddElement(0x0040, 0x9096);
-		return path;
+		return DICOMTagPath().AddElement(0x0040, 0x9096);
 	}
-	// IKO
 	DICOMTagPath DICOMPMConstants::UNITS_SEQUENCE_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::RWVM_SEQUENCE_PATH()).AddElement(0x0040, 0x08EA);
-		return path;
+		return DICOMPMConstants::RWVM_SEQUENCE_PATH().AddElement(0x0040, 0x08EA);
 	}
-	// IKO 
 	DICOMTagPath DICOMPMConstants::UNITS_CODE_VALUE_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::UNITS_SEQUENCE_PATH()).AddElement(0x0008, 0x0100);
-		return path;
+		return DICOMPMConstants::UNITS_SEQUENCE_PATH().AddElement(0x0008, 0x0100);
 	}
-	// IKO 
 	DICOMTagPath DICOMPMConstants::UNITS_CODE_SCHEME_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::UNITS_SEQUENCE_PATH()).AddElement(0x0008, 0x0102);
-		return path;
+		return DICOMPMConstants::UNITS_SEQUENCE_PATH().AddElement(0x0008, 0x0102);
 	}
-	// IKO 
 	DICOMTagPath DICOMPMConstants::UNITS_CODE_MEANING_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::UNITS_SEQUENCE_PATH()).AddElement(0x0008, 0x0104);
-		return path;
+		return DICOMPMConstants::UNITS_SEQUENCE_PATH().AddElement(0x0008, 0x0104);
 	}
 
-	// IKO 
 	DICOMTagPath DICOMPMConstants::QUANTITY_DEFINITION_SEQUENCE_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::RWVM_SEQUENCE_PATH()).AddElement(0x0040, 0x9220);
-		return path;
+		return DICOMPMConstants::RWVM_SEQUENCE_PATH().AddElement(0x0040, 0x9220);
 	}
-	// IKO 
 	DICOMTagPath DICOMPMConstants::QUANTITY_DEFINITION_VALUE_TYPE_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::QUANTITY_DEFINITION_SEQUENCE_PATH()).AddElement(0x0040, 0xA040);
-		return path;
+		return DICOMPMConstants::QUANTITY_DEFINITION_SEQUENCE_PATH().AddElement(0x0040, 0xA040);
 	}
-	// IKO 
 	DICOMTagPath DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_SEQUENCE_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::QUANTITY_DEFINITION_SEQUENCE_PATH()).AddElement(0x0040, 0xA168);
-		return path;
+		return DICOMPMConstants::QUANTITY_DEFINITION_SEQUENCE_PATH().AddElement(0x0040, 0xA168);
 	}
-	// IKO 
 	DICOMTagPath DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_VALUE_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_SEQUENCE_PATH()).AddElement(0x0008, 0x0100);
-		return path;
+		return DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_SEQUENCE_PATH().AddElement(0x0008, 0x0100);
 	}
-	// IKO 
 	DICOMTagPath DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_SCHEME_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_SEQUENCE_PATH()).AddElement(0x0008, 0x0102);
-		return path;
+		return DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_SEQUENCE_PATH().AddElement(0x0008, 0x0102);
 	}
-	// IKO 
 	DICOMTagPath DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_MEANING_PATH()
 	{
-		static DICOMTagPath path =
-			DICOMTagPath(DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_SEQUENCE_PATH()).AddElement(0x0008, 0x0104);
-		return path;
+		return DICOMPMConstants::QUANTITY_DEFINITION_CONCEPT_CODE_SEQUENCE_PATH().AddElement(0x0008, 0x0104);
 	}
 
 
 
-/*
-	DICOMTagPath DICOMPMConstants::SEGMENT_SEQUENCE_PATH()
-  {
-    static DICOMTagPath path = DICOMTagPath().AddElement(0x0062, 0x0002);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_NUMBER_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENT_SEQUENCE_PATH()).AddElement(0x0062, 0x0004);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_LABEL_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENT_SEQUENCE_PATH()).AddElement(0x0062, 0x0005);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_ALGORITHM_TYPE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENT_SEQUENCE_PATH()).AddElement(0x0062, 0x0008);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::ANATOMIC_REGION_SEQUENCE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENT_SEQUENCE_PATH()).AddElement(0x0008, 0x2218);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::ANATOMIC_REGION_CODE_VALUE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::ANATOMIC_REGION_SEQUENCE_PATH()).AddElement(0x008, 0x0100);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::ANATOMIC_REGION_CODE_SCHEME_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::ANATOMIC_REGION_SEQUENCE_PATH()).AddElement(0x008, 0x0102);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::ANATOMIC_REGION_CODE_MEANING_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::ANATOMIC_REGION_SEQUENCE_PATH()).AddElement(0x008, 0x0104);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENTED_PROPERTY_CATEGORY_SEQUENCE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENT_SEQUENCE_PATH()).AddElement(0x0062, 0x0003);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_CATEGORY_CODE_VALUE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_CATEGORY_SEQUENCE_PATH()).AddElement(0x008, 0x0100);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_CATEGORY_CODE_SCHEME_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_CATEGORY_SEQUENCE_PATH()).AddElement(0x008, 0x0102);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_CATEGORY_CODE_MEANING_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_CATEGORY_SEQUENCE_PATH()).AddElement(0x008, 0x0104);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENTED_PROPERTY_TYPE_SEQUENCE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENT_SEQUENCE_PATH()).AddElement(0x0062, 0x000F);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_TYPE_CODE_VALUE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_TYPE_SEQUENCE_PATH()).AddElement(0x008, 0x0100);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_TYPE_CODE_SCHEME_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_TYPE_SEQUENCE_PATH()).AddElement(0x008, 0x0102);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_TYPE_CODE_MEANING_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_TYPE_SEQUENCE_PATH()).AddElement(0x008, 0x0104);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENTED_PROPERTY_MODIFIER_SEQUENCE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_TYPE_SEQUENCE_PATH()).AddElement(0x0062, 0x0011);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_MODIFIER_CODE_VALUE_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_MODIFIER_SEQUENCE_PATH()).AddElement(0x008, 0x0100);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_MODIFIER_CODE_SCHEME_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_MODIFIER_SEQUENCE_PATH()).AddElement(0x008, 0x0102);
-    return path;
-  }
-
-  DICOMTagPath DICOMPMConstants::SEGMENT_MODIFIER_CODE_MEANING_PATH()
-  {
-    static DICOMTagPath path =
-      DICOMTagPath(DICOMPMConstants::SEGMENTED_PROPERTY_MODIFIER_SEQUENCE_PATH()).AddElement(0x008, 0x0104);
-    return path;
-  }
-*/
-
-
 }