IDEX-1708: code clean-up