more cleanup: cr's