Enhanced unsubscribe code