Cleaning up the tracks