Import fixes

Fixed an indirect import and moved a couple functions out of deps.py to help avoid import loops.

Also fixed a number of unnecessary imports