Remove nfsa logic