Cleaning up and consolidating