Start adding in some of the changes for merging releasecleaner and collectioncleaner