more cleanups to depenency code