BS-10829: clean code during investigation