IDEX-1424: Code clean-up