Removed unused dependencies
Simplify