am 42d2f1a5: Remove unused helper classes

* commit '42d2f1a5adf83591ea8f68340826a798c2a959a6':
  Remove unused helper classes