Some cleanup in ScheduleClass and databaseMani