more shaving of SC and waveform references