Remove service DatasetProvider, not used any more
Improve code style