Revise servitudes throughout