Get rid of the old deprecated data context concept