Cleaning up the reorganizing