some more cleanups