Cleanup, attempt at polling