Cleanup logging further.