First clean-up
Better performance on pollers