Removed event polling related stuff