cut cruft

Change-Id: Ibd1669b22e990d21b3fb35a6d412067e80b602b8