Condense some SOA validation logic
Move SOA cleaning logic to SOA.clean