cleaning up old polling code