TimeEntryHandler and some clean-up