Removed some of the logging