TimelineController.java cleanup