Some Clean of the SOAP-80 fix.