Remove some unused code
Merge pull request #1702 from Mnkras/patch-7

Remove some unused code