am d262744b: Merge "Some cruft removal."

* commit 'd262744b7e4fd9e01a9a0a5d70927328e9391bf9':
  Some cruft removal.