Remove some dead code.
Merge pull request #3039 from brendandburns/e2e

Remove some dead code.