cleaned up what is tracked