Remove some unused code.

Change-Id: Id29bf7d2118065e2e772b22d910bda1c6de2a475
4 files changed