Clean up cm_rels usage