diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore.oclinecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore.oclinecore
index d865d4e938ea1bf317255775c3b3dbf07797f0e2..d6912c0e84eed6556534d74d3eebbe6a9cf2994f 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore.oclinecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore.oclinecore
@@ -45,7 +45,6 @@ package functions : functions = 'http://www.descartes-research.net/metamodel/fun
 	class FormalParameter extends Expression
 	{
 		-- reference to a name of an influencing parameter
-		-- TODO what about CharacterizationType?
 		attribute value : String[?] { ordered };
 	}
 	abstract class Atom extends Expression;
@@ -124,7 +123,6 @@ package functions : functions = 'http://www.descartes-research.net/metamodel/fun
 		attribute value : Integer;	
 		attribute probability : Real;		
 	}
-	-- TODO maybe delete BoolSamples and EnumSamples, do we need them?
 	class BoolSample extends Sample {
 		attribute value : Boolean;	
 		attribute probability : Real;		
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
index 4ef65ec8b2dd252433771c369712d071ce9f6041..f466911784ad1831dc056a557db6eb8d47a86c4f 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
@@ -131,7 +131,7 @@ package repository : repository = 'http://www.descartes-research.net/metamodel/r
 	{
 		attribute capacity : Integer[1];
 	}
-	class CompositeComponent extends RepositoryComponent, ComposedProvidingRequiringEntity; --#TODO check necessity of (PCM) OCL constraints	
+	class CompositeComponent extends RepositoryComponent, ComposedProvidingRequiringEntity; 
 	
 	class SubSystem extends RepositoryComponent, ComposedProvidingRequiringEntity;
 		
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore
index d06ed3f5695336a6d2a7df0818e1b88aa5285ab2..d3b99e3f924a7ea17619620370a679cb6e9f844d 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/servicebehavior.ecore.oclinecore
@@ -89,7 +89,7 @@ package servicebehavior : servicebehavior = 'http://www.descartes-research.net/m
 	--################################################
 	
 /*	
-	--# TODO discuss this construction of InternalCallAction and InternalHelper(Container)
+	--# construction of InternalCallAction and InternalHelper(Container) ?
 	class InternalCallAction {
 		property internalFineGrainedBehaviorHelper : InternalFineGrainedBehaviorHelper[1];
 	}