Code clean up: remove some dead code.

Test: existing tests pass
Change-Id: I1e0e6f8218b3a6550476fe1aa092f685d7433d53
2 files changed