some merge cleanups