reorganization cleanup