Index: /ModelTranslator/.classpath
===================================================================
--- /ModelTranslator/.classpath	(revision 239)
+++ /ModelTranslator/.classpath	(revision 240)
@@ -4,9 +4,9 @@
 	<classpathentry excluding="de/uni_hildesheim/sse/trans/package-info.java|de/uni_hildesheim/sse/trans/in/package-info.java|de/uni_hildesheim/sse/trans/convert/package-info.java|de/uni_hildesheim/sse/trans/out/package-info.java|de/uni_hildesheim/sse/trans/in/rsf/package-info.java" kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Model"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Utils"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="resources/lib/commons-cli-1.2.jar"/>
 	<classpathentry kind="lib" path="resources/lib/commons-io-2.4.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/net.ssehub.easy.basics"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/net.ssehub.easy.varModel"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /ModelTranslator/.project
===================================================================
--- /ModelTranslator/.project	(revision 239)
+++ /ModelTranslator/.project	(revision 240)
@@ -11,13 +11,7 @@
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTNegater.java
===================================================================
--- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTNegater.java	(revision 239)
+++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTNegater.java	(revision 240)
@@ -41,5 +41,9 @@
     @Override
     public void visitConstantValue(ConstantValue value) {
-        throw new RuntimeException("Unexpected CST"); // TODO;
+        if (negated) {
+            result = new OCLFeatureCall(value, OclKeyWords.NOT);
+        } else {
+            result = value;
+        }
     }
 
Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter.java
===================================================================
--- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter.java	(revision 239)
+++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter.java	(revision 240)
@@ -212,16 +212,16 @@
         
         // expand to get closer to CNF
-        CSTExpander expander = new CSTExpander(MIN_SIMPLYIFY_LENGTH);
-        int numExpanded = 0;
-        do {
-            expander.clearResult();
-            originalConstraint.accept(expander);
-            if (expander.getResult() != null) {
-                originalConstraint = expander.getResult();
-                numExpanded++;
-            }
-        } while (expander.getResult() != null);
-        
-        LOGGER.info("Found " + numExpanded + " possible expansions to simplify constraint");
+//        CSTExpander expander = new CSTExpander(MIN_SIMPLYIFY_LENGTH);
+//        int numExpanded = 0;
+//        do {
+//            expander.clearResult();
+//            originalConstraint.accept(expander);
+//            if (expander.getResult() != null) {
+//                originalConstraint = expander.getResult();
+//                numExpanded++;
+//            }
+//        } while (expander.getResult() != null);
+//        
+//        LOGGER.info("Found " + numExpanded + " possible expansions to simplify constraint");
         return originalConstraint;
     }