Remove NFC in code