Add logger and other cleanup.