Removed a bunch of cruft.