Changed remove to poll