Remove old cruft

Change-Id: I59ad44dd520716a662d7540b09b379ed152fd74f