NX-392: cleanup logging