Remove unecessary class that comes with TRDS cherry-pick

Change-Id: I18d9a90dba6582f0955a18873c37c97b0633186b