Remove CM cruft as per ISLANDORA-962.