Complete refactor to remove all references of ip geo services