tidy up of datasource