More Dependency cleanup