Removed some junk and a std::ostream operator that was hanging around.