Small cleanup, end time is optional