Removed unused class (#11254)

Change-Id: I6c374e61452a0e3b1fedc5ecbd90d50c22619c63