and more cleanups