Better poll option removal, add some comments