am c332bb47: am 253e9d08: am c2660259: Merge "clean up a little bit"

* commit 'c332bb47ae267a413f1e3bed5c0e9b95368173aa':
  clean up a little bit