BS-11587: start to clean code