CMS Fields cleanup