adding back a version without tsp and cleanup