Better cleanup of times in departure