removed S3 waveform generation