Tidy orswot a little and update model

Idempotent remove is not a feature of the orswot