Remove old code.
Merge pull request #1331 from int3/incoming

Remove old code.