Killed class I forgot to remove a few weeks ago

Change-Id: Ie671fe0baaa6127c2070ff0544ff6a433254893f