Yet more cleanups