Resolve "Reverb code improvements". Remove old code after compiler switch acceptance See merge request !63