Actually kill SPP model

The functionality out of this that seemed important was duplicated
elsewhere in previous commits, but a lot of this isn't used elsewhere so
we might need to bring it back from the dead as we go.