cleanup according to cr