diff --git a/jsprit-analysis/src/main/java/analysis/SolutionPrinter.java b/jsprit-analysis/src/main/java/analysis/SolutionPrinter.java
index 01476de8..bf4b707c 100644
--- a/jsprit-analysis/src/main/java/analysis/SolutionPrinter.java
+++ b/jsprit-analysis/src/main/java/analysis/SolutionPrinter.java
@@ -66,6 +66,7 @@ public class SolutionPrinter {
 	 * @param solution
 	 * @param level
 	 */
+	@Deprecated
 	public static void print(VehicleRoutingProblemSolution solution, Print level){
 		if(level.equals(Print.CONCISE)){
 			print(solution);
diff --git a/jsprit-core/src/main/java/algorithms/StateIdImpl.java b/jsprit-core/src/main/java/algorithms/StateIdImpl.java
deleted file mode 100644
index e0945e13..00000000
--- a/jsprit-core/src/main/java/algorithms/StateIdImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package algorithms;
-
-import algorithms.StateManager.StateId;
-
-class StateIdImpl implements StateId {
-	
-	private String name;
-
-	public StateIdImpl(String name) {
-		super();
-		this.name = name;
-	}
-	
-	public String toString(){
-		return name;
-	}
-
-	
-}
\ No newline at end of file
diff --git a/jsprit-core/src/main/java/algorithms/StateManager.java b/jsprit-core/src/main/java/algorithms/StateManager.java
index a69989ec..b938eb0f 100644
--- a/jsprit-core/src/main/java/algorithms/StateManager.java
+++ b/jsprit-core/src/main/java/algorithms/StateManager.java
@@ -42,35 +42,14 @@ interface StateManager {
 			return state;
 		}
 		
-//		public void setState(double val){
-//			state=val;
-//		}
 	}
 	
 	interface States {
 		
-//		void putState(String key, State state);
-		
 		State getState(String key);
 		
 	}
-	
-	interface StateId {
 		
-		String toString();
-		
-	}
-	
-	
-	
-//	Map<VehicleRoute, States> getRouteStates();
-	
-//	void put(VehicleRoute route, States states);
-	
-//	Map<TourActivity, States> getActivityStates();
-	
-//	void put(TourActivity act, States states);
-	
 	State getActivityState(TourActivity act, String stateType);
 	
 	State getRouteState(VehicleRoute route, String stateType);
diff --git a/jsprit-core/src/main/java/algorithms/StateTypes.java b/jsprit-core/src/main/java/algorithms/StateTypes.java
index ccd115f9..2be93461 100644
--- a/jsprit-core/src/main/java/algorithms/StateTypes.java
+++ b/jsprit-core/src/main/java/algorithms/StateTypes.java
@@ -20,7 +20,6 @@
  ******************************************************************************/
 package algorithms;
 
-import algorithms.StateManager.StateId;
 
 class StateTypes {
 	
@@ -42,7 +41,4 @@ class StateTypes {
 	
 	final static String PAST_DELIVERIES = "pastDeliveries";
 	
-	public static StateId createId(String stateId){
-		
-	}
 }