More cleanup

Review URL: http://codereview.chromium.org/2718012
9 files changed