Remove unused cruft.

Change-Id: I21a10d74106d1e4384a70cb654e4336b8f679e4a
4 files changed