Cleaning up non-generic WaveJS stuff