Remove scwaveform and all references to it