remove cruft

Change-Id: I6b428138f6f59cd52917e4e16afa20b3b2498724