more cleanup for JsonSerde.java