major cleanup on routes