cleanup for CR