Removed all reference to service context