Revert "Improved polling and Session handling"

This reverts commit 07bbcd863acd4501d68788e1b726125eb4024441.