Remove more CMS specific code.