nfc: update/clean-up