Removed Commented code.
Removed unused imports.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
Merge pull request #962 from anilgooru/dev-branch

Removed Commented code.