Removed unused classes

Change-Id: I60e89fa1e1ce7dd29bddc1d8fafccdbb8d4b9140