removing unused TrackingMessages
cleanup ScheduleTracker
remove commented out code