yet more cleanups