Remove TODOs that are done and improve backoff detection