Removing a lot of cruft.