Removing more cruft.