Last cleanup around data source