Clean up prior to transfer