Cleanup after rename