Begin removal of references to "surgeries"
Fix merge error