Fix building, remove nfcee stuffs