cleanup in NFC code