Tidy-up for handover