minnor cleanups