Clean up some specs in DataImport and Table