and yet more cleanups