Removed old remnants of String in DataSources