Moved around some stuff. Removed the logging.