Cleaning up after reorganization