Remove unused import and bring in the GeneratedMessage-to-JSON stuff
We actually need protobuf here after all - at least for now