Remove unused or obsolete files
More refinements on api and datasource