Can't these unused fields in the case class and the readout be removed for now and added again when we want to use them? It's just in the way.