Remove some years-old cruft