minor mmanual post-merge-cleanups