Remove some unnecessary cruft.

Change-Id: I8d83954d42f3511a24a44a33c3b28f04af6d3b82
4 files changed