CON-1942: rid off unnecessary variable