Cleaning up tsp