diff --git a/tools.descartes.pmx.test/src/tools/descartes/pmx/test/PMXScenarioTest.java b/tools.descartes.pmx.test/src/tools/descartes/pmx/test/PMXScenarioTest.java
index 837308c8aba027e8f75ccc08912eeea68c407cd8..24bf7a276ec3fb1b9822258bc182bcff2302d852 100644
--- a/tools.descartes.pmx.test/src/tools/descartes/pmx/test/PMXScenarioTest.java
+++ b/tools.descartes.pmx.test/src/tools/descartes/pmx/test/PMXScenarioTest.java
@@ -141,15 +141,7 @@ public class PMXScenarioTest {
 	}
 	
 	private boolean extractModel(String[] args) {
-		PMXCommandLine cmd = PMXCommandLine.parse(args);
-		// delete files within directory
-		PMXController pmx = cmd.createPMX();
-		try{
-			pmx.run();
-			return true;			 
-		}catch (AnalysisConfigurationException e){
-			return false;
-		}
+		return PMXCommandLine.run(args);
 	}
 	
 	public static boolean deleteDirectory(String directory) {
diff --git a/tools.descartes.pmx.test/src/tools/descartes/pmx/test/Util.java b/tools.descartes.pmx.test/src/tools/descartes/pmx/test/Util.java
index b1228d60be079e350f75cb5994b7bd3e9ccf5c8d..aa4c4f81a44324111ba882701190b307fb859417 100644
--- a/tools.descartes.pmx.test/src/tools/descartes/pmx/test/Util.java
+++ b/tools.descartes.pmx.test/src/tools/descartes/pmx/test/Util.java
@@ -30,23 +30,6 @@ import java.io.File;
 
 public class Util {
 	
-//	private static Logger logger = Logger.getRootLogger();
-//	
-//	public static Logger getLogger(String logFileName) {
-//		try {
-//	        SimpleLayout layout = new SimpleLayout();
-//	        ConsoleAppender consoleAppender = new ConsoleAppender( layout );
-//	        logger.addAppender( consoleAppender );
-//	        FileAppender fileAppender = new FileAppender( layout,logFileName, false );
-//	        logger.addAppender( fileAppender );
-//	        // ALL | DEBUG | INFO | WARN | ERROR | FATAL | OFF:
-//	        logger.setLevel( Level.INFO );	//WARN
-//	      } catch( Exception ex ) {
-//	        System.out.println( ex );
-//	      }
-//	    return logger;
-//	}
-	
 	public static boolean deleteDirectory(File directory) {
 		if (directory.exists()) {
 			File[] files = directory.listFiles();