replace some references to ServiceContext with Context
remove unused and unimplemented DataspaceStorer