am 53771e5f: Merge "Remove useless/repetitive code"

* commit '53771e5f955f67035cf6b6432c34171a18ab14dc':
  Remove useless/repetitive code