Cleaning up dead code.

Change-Id: I922e20b41d19ca9936c75277ba7c58a291d297fa
37 files changed