Removed duplicate poller-wrapper code