diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83c175a675..28a3a6f587 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Changes in this release:
 - Catch various silent test failures
 - Initialise variable for upload of version with no resources
 - Raise exception on bad export to make inmanta export fail with exit status > 0
+- Removed the non-version api (#526)
 
 v 2018.3 (2018-12-07)
 Changes in this release:
diff --git a/src/inmanta/protocol.py b/src/inmanta/protocol.py
index df46bb2254..9cb7465481 100644
--- a/src/inmanta/protocol.py
+++ b/src/inmanta/protocol.py
@@ -26,7 +26,6 @@
 from datetime import datetime
 from collections import defaultdict
 import enum
-import warnings
 import io
 import gzip
 
@@ -279,11 +278,11 @@ def callback(self, fnc):
 # Shared
 class RESTBase(object):
 
-    def _create_base_url(self, properties, msg=None, versioned=True):
+    def _create_base_url(self, properties, msg=None):
         """
             Create a url for the given protocol properties
         """
-        url = "/api/v1" if versioned else ""
+        url = "/api/v1"
         if "id" in properties and properties["id"]:
             if msg is None:
                 url += "/%s/(?P<id>[^/]+)" % properties["method_name"]
@@ -310,10 +309,6 @@ def _decode(self, body):
 
     @gen.coroutine
     def _execute_call(self, kwargs, http_method, config, message, request_headers, auth=None):
-        if "api_version" in config[0] and config[0]["api_version"] is None:
-            warnings.warn("Using an unversioned API method will be removed in the next release", DeprecationWarning)
-            LOGGER.warning("Using an unversioned API method will be removed in the next release")
-
         headers = {"Content-Type": "application/json"}
         try:
             if kwargs is None or config is None:
@@ -543,11 +538,6 @@ def create_op_mapping(self):
             properties["api_version"] = "1"
             url_map[url][properties["operation"]] = (properties, call, method.__wrapped__)
 
-            url = self._create_base_url(properties, versioned=False)
-            properties = properties.copy()
-            properties["api_version"] = None
-            url_map[url][properties["operation"]] = (properties, call, method.__wrapped__)
-
         headers.add("Authorization")
         self.headers = headers
         return url_map
diff --git a/src/inmanta/server/protocol.py b/src/inmanta/server/protocol.py
index 983e90fb53..d511f7c170 100644
--- a/src/inmanta/server/protocol.py
+++ b/src/inmanta/server/protocol.py
@@ -88,10 +88,6 @@ def create_op_mapping(self):
                 url = self._create_base_url(properties)
                 properties["api_version"] = "1"
                 url_map[url][properties["operation"]] = (properties, call, method.__wrapped__)
-                url = self._create_base_url(properties, versioned=False)
-                properties = properties.copy()
-                properties["api_version"] = None
-                url_map[url][properties["operation"]] = (properties, call, method.__wrapped__)
         return url_map
 
     def start(self):