am 9ac59472: am 42d2f1a5: Remove unused helper classes

* commit '9ac5947204df0b5b05800d989fa9139daede9ce0':
  Remove unused helper classes