Remove references to old IDIR_*