cleanup
Improvements to polling forbidden states