diff --git a/.env b/.env
index e2df1ae2fd01253f8c3a7f993dd8a223a657dd59..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/.env
+++ b/.env
@@ -1 +0,0 @@
-VUE_APP_SEARCH_ENDPOINT='https://oda.uib.no/opal/api/'
diff --git a/.env.dev_server b/.env.dev_server
index 8c9f2bf6a3d82dfdbb6325b70a80b79d300a3a5e..31573c1642cf525ffbcb86d3a26f5c3f8c3a6010 100644
--- a/.env.dev_server
+++ b/.env.dev_server
@@ -1,3 +1,3 @@
 NODE_ENV=production
-VUE_APP_API_STAGE=dev
 VUE_APP_ARTICLE_ENDPOINT='https://oda.uib.no/opal/dev/'
+VUE_APP_SEARCH_ENDPOINT='https://oda.uib.no/opal/dev/api/'
diff --git a/.env.local b/.env.local
index 6750c0ed21db114acd6f7a4c7ae67928f35226c2..53d6b6d7911d76507e18fafad482ea4f6f9237fc 100644
--- a/.env.local
+++ b/.env.local
@@ -1,4 +1,4 @@
-VUE_APP_API_STAGE=dev
 VUE_APP_ARTICLE_ENDPOINT='https://oda.uib.no/opal/dev/'
+VUE_APP_SEARCH_ENDPOINT='https://oda.uib.no/opal/dev/api/'
 VUE_APP_VERSION_LABEL=LOCAL
 VUE_APP_RELEASE=test
diff --git a/.env.production b/.env.production
index 49ffbcdede3a033d81ec1948aa97c38864ecd66d..e67c7aae3624d404de5bb2442d86222a9a414427 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,4 @@
 NODE_ENV=production
 VUE_APP_VERSION_LABEL=Beta
-VUE_APP_API_STAGE=prod
 VUE_APP_ARTICLE_ENDPOINT='https://oda.uib.no/opal/prod/'
+VUE_APP_SEARCH_ENDPOINT='https://oda.uib.no/opal/prod/api/'
diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
index d67a8a3d67cd7d336de9fae4e8813d0c4b8b2639..20dc33a53146100766b00bfd655dc53f7a6aa7c1 100644
--- a/src/components/Autocomplete.vue
+++ b/src/components/Autocomplete.vue
@@ -96,7 +96,7 @@
           this.items.push({q: q, label: q, time: time, search: search})
         }
         let self = this
-        self.api.get('suggest?', {params: {q: q, dict: self.get_lang(), n: 80, scope: 'w', stage: self.$parent.stage}})
+        self.api.get('suggest?', {params: {q: q, dict: self.get_lang(), n: 80, scope: 'w'}})
             .then(async (response) => {
                         if (self.$refs.autocomplete.searchInput == q & self.suggesting) {
 
diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue
index 9441c69b3b37fa3e40440c10b58bd13790423ba2..3786198efc5a41d7060ac5ed7892af5b36680b96 100644
--- a/src/components/DictionaryView.vue
+++ b/src/components/DictionaryView.vue
@@ -78,7 +78,6 @@ import { setup } from 'axios-cache-adapter'
 
 const SEARCH_ENDPOINT = process.env.VUE_APP_SEARCH_ENDPOINT
 const ARTICLE_ENDPOINT= process.env.VUE_APP_ARTICLE_ENDPOINT
-const API_STAGE = process.env.VUE_APP_API_STAGE
 
 const dicts = {'nob': 'Nynorskorboka',
                'bob': 'Bokmålsordboka',
@@ -163,7 +162,7 @@ function navigate_to_query(self, word) {
   let  query = self.event ? self.event : {q: word} 
   
   // Get article IDs
-  api.get('articles?', {params: {w: query.match || query.q, dict: self.lang, scope: "w", stage: self.stage}}).then((response) => {
+  api.get('articles?', {params: {w: query.match || query.q, dict: self.lang, scope: "w"}}).then((response) => {
             let article_ids = response.data
             let unwrapped = []
             for (const d in article_ids) {
@@ -239,7 +238,6 @@ export default {
       monthly_bm: null,
       monthly_nn: null,
       event: null,
-      stage: API_STAGE
     }
   },
   computed: {