* Fix connection/become task loop settings * Remove old code (cherry picked from commit ba6da65a0f)
ba6da65a0f