Removed MainWaveformDraw