Remove variables not needed when using poll