More and more cleanups