Minor changes
Removed unneccesary dependencies
Removed obsolete code/comments
Removed obsolete code/comments