TimeScheduler events now inherit from a common event, and cleanup of Event