Removed more cruft!