Removing some unused classes

Bug: 184183801
Test: Manual
Change-Id: I946b4b4d486d52e467bb3df7dcac65e534803b7d
2 files changed