CLIO-16722 clean up remaining active polls