removed poll stuff