Removed duplicate dependency, and removed use of Global storage variable