removed more things in RFI