Remove unused code
Merge pull request #1488 from xt0rted/old-code

Remove unused code