IDEX-1634 Code clean up