Removing more old cruft.