- Some more cleanups