Removed unused dependencies, and removed commented code