Clean up code and remove right and locfacerigh from Face4Sort.