Added dependency
Removed unused code