Removed dataprovider classes.
Removed dependencies of the now removed dataprovider class.