am bdc2b5f9: Merge "Removing some duplicate methods" into ub-now-queens

* commit 'bdc2b5f963a93bddade98daaf2a329c976b199e0':
  Removing some duplicate methods