Cleanup time parsing