rework poll so unsubscribes work