diff --git a/smartmetconf/engines/querydata.conf b/smartmetconf/engines/querydata.conf
index 971e46f..caff549 100644
--- a/smartmetconf/engines/querydata.conf
+++ b/smartmetconf/engines/querydata.conf
@@ -1,13 +1,12 @@
 verbose = true;
 
 # Where to cache valid points
-valid_points_cache_dir = "/var/smartmet/querydata/validpoints";
+valid_points_cache_dir = "/var/smartmet/cache/validpoints";
 
 # Note: order is significant
 producers =
 [	"meteor",
         "meps_northeurope_surface",
-        "hirlam_europe_surface",
 	"icon_surface",
 	"gfs_world_surface",
 	"gem_world_surface",
@@ -15,7 +14,6 @@ producers =
 	"gensctrl_world_surface",
 	"hbm_baltic_surface",
 	"wam_baltic_surface",
-        "hirlam_europe_pressure",
         "meps_northeurope_pressure",
 	"icon_pressure",
 	"gfs_world_pressure",
@@ -64,31 +62,6 @@ meps_northeurope_pressure:
         number_to_keep          = 2;
 };
 
-hirlam_europe_surface:
-{
-        alias                   = "hirlam";
-        directory               = "/smartmet/data/hirlam/surface";
-        pattern                 = ".*_hirlam_europe_surface\.sqd$";
-        forecast                = true;
-        type                    = "grid";
-        leveltype               = "surface";
-        refresh_interval_secs   = 60;
-        number_to_keep          = 4;
-	multifile               = true;
-};
-
-hirlam_europe_pressure:
-{
-        alias                   = "hirlam_pressure";
-        directory               = "/smartmet/data/hirlam/pressure";
-        pattern                 = ".*_hirlam_europe_pressure\.sqd$";
-        forecast                = true;
-        type                    = "grid";
-        leveltype               = "pressure";
-        refresh_interval_secs   = 60;
-        number_to_keep          = 2;
-};
-
 icon_surface:
 {
         alias                   = "icon";