PCT-808: cleanup + fix usage of logger (didn't expect such behaviour)