Remove class that does something similar.

Reviewed-by: Christian Kandeler
Change-Id: I7acfa119cf18d96c22d1873a464b1c004c78e132