Cleaned up schedules, moved code to base instead