remove some more files and put back our nfc libs