Some more cleanups