Removed the cruft.