Remove memory dumping, and add some more logging.