Remove unsed importer class and refactor inportXml model