clean up of metadata code in GraphImporter