Removed more cruft