clean up what is tracked