even more cleanups