removed polling which is not ready yet