Removed more cruft.