Remove unused "hasDependency" and tweak internal func names