cr cleaup - third times a charm?