Cleanup: Removes unused dependencies.
Cleanup: Removes duplicate info in dataproviders for clarity.