Cleanup my_schedule + Java updates