CF-154: get rid of SOP