remove more dead requires.
resolve merge conflict
Merge pull request #2414 from ether/remove-old

Remove old