diff --git a/jsprit-core/src/main/java/algorithms/Gendreau.java b/jsprit-core/src/main/java/algorithms/Gendreau.java
index 7c46473d..b2b76cd8 100644
--- a/jsprit-core/src/main/java/algorithms/Gendreau.java
+++ b/jsprit-core/src/main/java/algorithms/Gendreau.java
@@ -36,8 +36,8 @@ import basics.algo.RuinListener;
 import basics.algo.SearchStrategyModule;
 import basics.algo.SearchStrategyModuleListener;
 import basics.route.TourActivity;
-import basics.route.VehicleFleetManager;
 import basics.route.TourActivity.JobActivity;
+import basics.route.VehicleFleetManager;
 import basics.route.VehicleRoute;
 
 final class Gendreau implements SearchStrategyModule{
diff --git a/jsprit-core/src/main/java/algorithms/Inserter.java b/jsprit-core/src/main/java/algorithms/Inserter.java
index a649bdc2..afe677ba 100644
--- a/jsprit-core/src/main/java/algorithms/Inserter.java
+++ b/jsprit-core/src/main/java/algorithms/Inserter.java
@@ -16,8 +16,6 @@
  ******************************************************************************/
 package algorithms;
 
-import org.apache.log4j.Logger;
-
 import algorithms.InsertionData.NoInsertionFound;
 import basics.Job;
 import basics.Service;
diff --git a/jsprit-core/src/main/java/algorithms/PickupAndDeliverShipmentLoadActivityLevelConstraint.java b/jsprit-core/src/main/java/algorithms/PickupAndDeliverShipmentLoadActivityLevelConstraint.java
index 60c7ac8b..d54653ff 100644
--- a/jsprit-core/src/main/java/algorithms/PickupAndDeliverShipmentLoadActivityLevelConstraint.java
+++ b/jsprit-core/src/main/java/algorithms/PickupAndDeliverShipmentLoadActivityLevelConstraint.java
@@ -2,7 +2,6 @@ package algorithms;
 
 import org.apache.log4j.Logger;
 
-import algorithms.HardActivityStateLevelConstraint.ConstraintsStatus;
 import basics.route.DeliverShipment;
 import basics.route.PickupShipment;
 import basics.route.Start;
diff --git a/jsprit-core/src/main/java/algorithms/ServiceLoadActivityLevelConstraint.java b/jsprit-core/src/main/java/algorithms/ServiceLoadActivityLevelConstraint.java
index 9e23f68c..65ede0ec 100644
--- a/jsprit-core/src/main/java/algorithms/ServiceLoadActivityLevelConstraint.java
+++ b/jsprit-core/src/main/java/algorithms/ServiceLoadActivityLevelConstraint.java
@@ -7,7 +7,6 @@ import basics.route.PickupService;
 import basics.route.ServiceActivity;
 import basics.route.Start;
 import basics.route.TourActivity;
-import basics.route.VehicleRoute;
 
 /**
  * Ensures load constraint for inserting ServiceActivity.
diff --git a/jsprit-core/src/main/java/algorithms/UpdateActivityTimes.java b/jsprit-core/src/main/java/algorithms/UpdateActivityTimes.java
index 860504c0..8d18d0c9 100644
--- a/jsprit-core/src/main/java/algorithms/UpdateActivityTimes.java
+++ b/jsprit-core/src/main/java/algorithms/UpdateActivityTimes.java
@@ -3,7 +3,6 @@ package algorithms;
 import org.apache.log4j.Logger;
 
 import util.ActivityTimeTracker;
-
 import basics.costs.ForwardTransportTime;
 import basics.route.ActivityVisitor;
 import basics.route.TourActivity;
diff --git a/jsprit-core/src/main/java/algorithms/UpdateVariableCosts.java b/jsprit-core/src/main/java/algorithms/UpdateVariableCosts.java
index 893813b4..f8383b50 100644
--- a/jsprit-core/src/main/java/algorithms/UpdateVariableCosts.java
+++ b/jsprit-core/src/main/java/algorithms/UpdateVariableCosts.java
@@ -3,14 +3,12 @@ package algorithms;
 import org.apache.log4j.Logger;
 
 import util.ActivityTimeTracker;
-
 import algorithms.StateManager.StateImpl;
 import basics.costs.ForwardTransportCost;
 import basics.costs.VehicleRoutingActivityCosts;
 import basics.costs.VehicleRoutingTransportCosts;
 import basics.route.ActivityVisitor;
 import basics.route.TourActivity;
-import basics.route.Vehicle;
 import basics.route.VehicleRoute;
 
 /**
diff --git a/jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java b/jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java
index 120104f1..11c4740e 100644
--- a/jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java
+++ b/jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java
@@ -46,7 +46,6 @@ import algorithms.selectors.SelectRandomly;
 import algorithms.selectors.SolutionSelector;
 import basics.VehicleRoutingAlgorithm;
 import basics.VehicleRoutingProblem;
-import basics.VehicleRoutingProblem.Constraint;
 import basics.VehicleRoutingProblem.FleetSize;
 import basics.VehicleRoutingProblemSolution;
 import basics.algo.AlgorithmStartsListener;
diff --git a/jsprit-core/src/main/java/basics/route/DeliveryActivity.java b/jsprit-core/src/main/java/basics/route/DeliveryActivity.java
index fc859139..4c49f0fc 100644
--- a/jsprit-core/src/main/java/basics/route/DeliveryActivity.java
+++ b/jsprit-core/src/main/java/basics/route/DeliveryActivity.java
@@ -16,7 +16,6 @@
  ******************************************************************************/
 package basics.route;
 
-import basics.Delivery;
 import basics.route.TourActivity.JobActivity;
 
 public interface DeliveryActivity extends JobActivity{
diff --git a/jsprit-core/src/test/java/algorithms/ServiceInsertionAndLoadConstraintsTest.java b/jsprit-core/src/test/java/algorithms/ServiceInsertionAndLoadConstraintsTest.java
index 3d28bfe0..31af1b45 100644
--- a/jsprit-core/src/test/java/algorithms/ServiceInsertionAndLoadConstraintsTest.java
+++ b/jsprit-core/src/test/java/algorithms/ServiceInsertionAndLoadConstraintsTest.java
@@ -1,7 +1,6 @@
 package algorithms;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
 import java.util.Arrays;
@@ -12,17 +11,14 @@ import org.junit.Test;
 import util.Coordinate;
 import util.Locations;
 import util.ManhattanCosts;
-import algorithms.ConstraintManager.Priority;
 import basics.Delivery;
 import basics.Pickup;
-import basics.Service;
 import basics.Shipment;
 import basics.VehicleRoutingProblem;
 import basics.costs.VehicleRoutingActivityCosts;
 import basics.costs.VehicleRoutingTransportCosts;
 import basics.route.Driver;
 import basics.route.DriverImpl;
-import basics.route.RouteActivityVisitor;
 import basics.route.TourActivity;
 import basics.route.Vehicle;
 import basics.route.VehicleImpl;
diff --git a/jsprit-core/src/test/java/algorithms/ShipmentInsertionCalculatorTest.java b/jsprit-core/src/test/java/algorithms/ShipmentInsertionCalculatorTest.java
index 37d46f5b..46a5912a 100644
--- a/jsprit-core/src/test/java/algorithms/ShipmentInsertionCalculatorTest.java
+++ b/jsprit-core/src/test/java/algorithms/ShipmentInsertionCalculatorTest.java
@@ -13,9 +13,7 @@ import util.Coordinate;
 import util.Locations;
 import util.ManhattanCosts;
 import algorithms.ConstraintManager.Priority;
-import basics.Delivery;
 import basics.Pickup;
-import basics.Service;
 import basics.Shipment;
 import basics.VehicleRoutingProblem;
 import basics.costs.VehicleRoutingActivityCosts;
diff --git a/jsprit-core/src/test/java/basics/route/VehicleRouteBuilderTest.java b/jsprit-core/src/test/java/basics/route/VehicleRouteBuilderTest.java
index 6cc7bcc9..f8c5862e 100644
--- a/jsprit-core/src/test/java/basics/route/VehicleRouteBuilderTest.java
+++ b/jsprit-core/src/test/java/basics/route/VehicleRouteBuilderTest.java
@@ -1,10 +1,11 @@
 package basics.route;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import org.junit.Test;
 
 import basics.Shipment;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
 
 public class VehicleRouteBuilderTest {