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

* commit 'f23eb104d17ae989ff58f57498983f8aab37eb58':
  Remove unused helper classes