Remove more NFC cruft