Remove old code.
Merge pull request #267 from i0rek/dead_code

Remove old code.