Remove dead code #11: Remove more unused classes

Change-Id: I3130991cb468a47aa0e198e42f20edca0836f66b
33 files changed