Removing some unused classes

Test: Everything builds
Change-Id: I92f630b12d2247ad8cf29bb5e2a4c190aa27bced
4 files changed