correctly order polls and remove useless custom requests