removed data context dependency