Improve logging.
Remove outdated comments