Some cruft removal.

Change-Id: If4a94bfd4a033748eb13e8f3ff25e24382746778
10 files changed