clean SOS commit

One of these days I'll rebase without breaking everything...