Code Cleanup : Removed unused code and imports
Merge remote-tracking branch 'upstream/2.1' into 2.1
Merge pull request #11 from onkar-dhuri/2.1

Removed unused imports and dead code