Revert "New datacontext with lazy loading"

This reverts commit f25f77861ddcec79ed117b35a966b85a5497783c.