BS-10626: clean code during investigation