CMS model classes cleanup.