am c2660259: Merge "clean up a little bit"

* commit 'c26602593286fd574bb880fe0c5e3439de890d37':
  clean up a little bit