CMS Cleaning and Grunt Updates