Dependency cleanup

Tested and works.