Remove protobuf stuff + add some queries