Remove last vestiges of NFC (Peter Riley <Peter.Riley@hotpop.com>)
86 files changed