[Cleanup] Final moves before we remove and recreate.