Remove unneccesary logging, and remove unneccesary polling