Remove some additional traces of scwaveform