Remove Elementype from Reportingfactora and CollectionDataSource
Cleanup