IDEX-706, IDEX-811: Remove missing code