Remove old cruft

Change-Id: I1140bb931d4d6d16d0b6e0c5e9237a4fe5d63243
Merge "Remove old cruft"