Remove more stuff

R=sky@chromium.org

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