integrated more cleanups from fine