Removing SAM from master in order to finalize it on the SP-with-SAM branch.