Merge pull request #961 from anilgooru/dev-branch

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

* upstream/dev-branch: