Rewrite unsubscribe with saction
Merges izend/master