Removed dead code and added comments
Removed unnecessary dependencies