Minor Refactor, removed unused dependencies.