DataProvider sucks, let's remove it.