Removing code which was most likely a left over from a refactor and not used anymore
Merge pull request #1483 from JerryVerhoef/issue-1458-removing-obsolete-code

Removing code which was most likely a left over from a refactor and not ...