Cleaned up SNS and SQS primitives