Cleanup after re-arrangement