Remove auto poll_time calculation