cleanup - remove TableMetadata
rename XsdType to Type