Make tests pass again

Remove some cruft along the way.