misc: Various NFC format fixes and a removal of unused define.