clean up tracker to hide methods that shouldn't be visible and remove unused methods