BS-11306: clean code during investigation on issue