removed GetIr etc