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

* commit 'dbc51de44fe4f9a7f81528204250de32ec405d39':
  Remove useless/repetitive code