Clean up for cm again