Removing unnecesary logic from GeoScorer