Also deletes code that becomes dead as a result. R=rmacnak@google.com Review-Url: https://codereview.chromium.org/2996903002 .
Zachary Anderson