Cleanups for poll mode