Merge commit 'a9e2d48a2d1531c413cbaeb0201242cc669eacda'

* commit 'a9e2d48a2d1531c413cbaeb0201242cc669eacda':
  rm dead code
Merge branch 'master' into css-edits

* master: