merge cleanups from git