Remove a bunch more unneeded stuff.

TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/663023010