waveform: remove unneeded wrapped struct values