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

* commit '253e9d083c56ddf224c42e8792c862f8b5d7b109':
  clean up a little bit