Refactoring codes: clean datasource is no longer used.