Comments and removed some logging.