Final cleanup after reorganization.