Remove more CMS specific or outdated code.