am b6a97196: Merge "More cleanup."

* commit 'b6a971962acdf2684fd98658ec6fe6aa9952d84b':
  More cleanup.