added clean up for data sources