trimmed down service definitions, next is removing custom rpc code?