Merged Sahil's changes

Removed unused code and merged sahil's changes