Several more cleanups