Removed more code dealign with ProtoBuffer