1) more cleanups