clean up tracking...