Clean up after reorganization