few more cleanups