core-1667 removed unused code
Merge pull request #609 from vksvenkat/master

core-1667 removed unused code