Removed a lot more cruft.