Remove CMS specific code