Remove protobuf type usage in core logic.

There are protobuf types being used in core logic. This approach was taken to avoid unneeded duplication but this duplication leads to a cleaner and less error prone design. The needed changes should not cause breaking changes.

Will help in avoiding bugs like: #5459