Don't do whitening in every iteration

This way we save estimating the waveforms twice per iteration