Tidy up ready for handover