cmr done, still need to clean up delete