Remove of deprecated datasource