removed unused ContextProviderFactory & SimpleContextProvider