Added dependencies
Removed unused code