Temp:Remove unadded CM features for now