CF-154: get rid of SOP

Alex wants this gone.