MacCain demands removal of NOC condition for US diplomats