Adios Goo

and small cleanup

Change-Id: I5b2c9665d8c59d0c599ac90b152d992bc7fb110b
Remove duplicate value for Sweden 2G

Change-Id: If71cfb799a23a46c039ecefab718433ad0c2bf82
Merge remote-tracking branch 'upstream/kk' into fjcarbon