IDEX-1129: remove depricated code