remove cruft

Change-Id: Id5ba28d7862590e11cca24fc8e25ca68fae1d5a8