Updated unsubscribe functionality