diff --git a/src/RemoteSimulationControl.java b/src/RemoteSimulationControl.java
index 710d13fc632adce42130aa8a33c6c49247e985d7..aa3b289e4f452e42978aa5357dc161de269f77a8 100755
--- a/src/RemoteSimulationControl.java
+++ b/src/RemoteSimulationControl.java
@@ -44,13 +44,13 @@ knowledge of the CeCILL license and that you accept its terms.
 * @see
 */
 
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
-import remotesimulation.*;
-
-import myutil.*;
-//import uppaaldesc.*;
+import remotesimulation.CommandParser;
+import remotesimulation.RemoteConnection;
+import remotesimulation.RemoteConnectionException;
 
 public class RemoteSimulationControl extends Thread  {
 	
diff --git a/src/RunDSE.java b/src/RunDSE.java
index b9925d466f28761f2e843295a8047fd6b8bc81c2..cd800965624987bfc5bfd44fb1ee19ef4645c6f8 100755
--- a/src/RunDSE.java
+++ b/src/RunDSE.java
@@ -44,21 +44,7 @@ knowledge of the CeCILL license and that you accept its terms.
 * @see
 */
 
-import java.io.*;
-import java.util.*;
-
-//import tmltranslator.*;
-//import tmltranslator.touppaal.*;
-//import tmltranslator.tomappingsystemc.*;
-import tmltranslator.tomappingsystemc2.*;
-//import tmltranslator.toturtle.*;
-
-import translator.*;
-
-import dseengine.*;
-
-import myutil.*;
-//import uppaaldesc.*;
+import dseengine.DSEScriptReader;
 
 public class RunDSE  {
 
diff --git a/src/TMLTranslator.java b/src/TMLTranslator.java
index 3bec0d1037bf306c4bb7fe9ed64458a11546145c..5c593d04c4976f05e7e561f72fa10d8e06afdc61 100755
--- a/src/TMLTranslator.java
+++ b/src/TMLTranslator.java
@@ -45,19 +45,23 @@
    * @see
    */
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
 
-import tmltranslator.*;
-import tmltranslator.touppaal.*;
-import tmltranslator.tomappingsystemc.*;
-import tmltranslator.tomappingsystemc2.*;
-import tmltranslator.toturtle.*;
-
-import translator.*;
-
-import myutil.*;
 //import uppaaldesc.*;
+import myutil.FileUtils;
+import tmltranslator.TMLError;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLMappingTextSpecification;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLSyntaxChecking;
+import tmltranslator.TMLTextSpecification;
+import tmltranslator.toturtle.Mapping2TIF;
+import tmltranslator.toturtle.TML2TURTLE;
+import tmltranslator.touppaal.TML2UPPAAL;
+import translator.TURTLEModeling;
+import translator.TURTLETranslator;
 
 public class TMLTranslator  {
     // 0 -> LOTOS