Remove no longer used class

Change-Id: Ie669575cc373d1f3b67050d842c47a74e0a35457
Merge "Remove no longer used class"