Cleanup in datasource modules