Eradicate redundant cellular network mode definitions (1/2)

Change-Id: I9c3d00765a684ceb085e26959925095a69e528b0