Fixed remove waveform