Index: trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java	(revision 193)
+++ trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java	(revision 197)
@@ -1,5 +1,4 @@
 package tmcsim.cadsimulator.managers;
 
-import atmsdriver.ConsoleTrafficDriver;
 import atmsdriver.model.Highways;
 import atmsdriver.model.LoopDetector;
@@ -19,5 +18,4 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Observable;
 import java.util.Properties;
 import java.util.Scanner;
@@ -31,6 +29,4 @@
 import tmcsim.cadsimulator.Coordinator;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
-import tmcsim.client.ATMSBatchDriver;
-import tmcsim.client.ATMSBatchViewer;
 import tmcsim.common.SimulationException;
 
@@ -162,5 +158,5 @@
                     catch (ParseException ex)
                     {
-                        Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
+                        Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
                         System.out.println("Invalid simulation clock time found in ATMSDriverClient");
                         System.exit(-1);
@@ -171,5 +167,5 @@
                 {
                     System.out.println("Remote Exception reading sim or ATMS clock time");
-                    Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
+                    Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
                 }
                 // If we have any events left to process
@@ -302,5 +298,5 @@
                     catch (ParseException ex)
                     {
-                        Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
+                        Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
                         System.out.println("Wrong format data in batch event file: " + line + " \nskipping.");
                         System.out.println("Skipping badly formatted event.");
@@ -311,5 +307,5 @@
         catch (FileNotFoundException ex)
         {
-            Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
         }
         System.out.println("Events file read, " + eventList.size() + " events queued.");