Remove waveforms #66