Cleaned up and removed unnecessary logging.