Fix cleanup. Improve logging.