More clean up from waveforms