Cherry-picking in @cgzones geoip clean

I have merged this but i have not tested it.