major refactor - protoservice removed