more clean up for multiple track