clean up tracking