more cleanups part3