Clean up of WaveGenerator Utilities.