Added new functionality to unsubscribe.