Remove Carbonnaux and Gouy and put Revol instead