poll misc clean-up.