removed distinguishing ContextClient and ContextServer. Now it is just Context for both.