Removed some more cruft. May as well call this 1.0