ug-2835: cleanup logging