Review fixes. Removes either/or network selection.