Commits on 20-11-14

 Added Nikhil's changes and Also removed unused variables and imports