Fixed circular dependency, removed deprecated pkgs since its a stand alone pkg