Remove unused class

Change-Id: Ie8436485697f047f4832c90a1acf0c16c657493a