Fix error in delaying poll to respect user's time window, which made an
artificial loop of poll schedulings.
Fix removal of polls