Improved the importer. Removed more references of NTENTAN