Removed lots of historic cruft