cr cleanups