Add raw message delivery to CNSSubscription
Remove unused code