Removed some more cruft.