diff --git a/src/redismodule.h b/src/redismodule.h
index 826686ac5..948063cfa 100644
--- a/src/redismodule.h
+++ b/src/redismodule.h
@@ -876,9 +876,6 @@ REDISMODULE_API int (*RedisModule_SetCommandKeySpecBeginSearchKeyword)(RedisModu
 REDISMODULE_API int (*RedisModule_SetCommandKeySpecFindKeysRange)(RedisModuleCommand *command, int spec_id, int lastkey, int keystep, int limit) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_SetCommandKeySpecFindKeysKeynum)(RedisModuleCommand *command, int spec_id, int keynumidx, int firstkey, int keystep) REDISMODULE_ATTR;
 
-/* Experimental APIs */
-#ifdef REDISMODULE_EXPERIMENTAL_API
-#define REDISMODULE_EXPERIMENTAL_API_VERSION 3
 REDISMODULE_API RedisModuleBlockedClient * (*RedisModule_BlockClient)(RedisModuleCtx *ctx, RedisModuleCmdFunc reply_callback, RedisModuleCmdFunc timeout_callback, void (*free_privdata)(RedisModuleCtx*,void*), long long timeout_ms) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_UnblockClient)(RedisModuleBlockedClient *bc, void *privdata) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_IsBlockedReplyRequest)(RedisModuleCtx *ctx) REDISMODULE_ATTR;
@@ -950,7 +947,6 @@ REDISMODULE_API int (*RedisModule_DefragCursorSet)(RedisModuleDefragCtx *ctx, un
 REDISMODULE_API int (*RedisModule_DefragCursorGet)(RedisModuleDefragCtx *ctx, unsigned long *cursor) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_GetDbIdFromDefragCtx)(RedisModuleDefragCtx *ctx) REDISMODULE_ATTR;
 REDISMODULE_API const RedisModuleString * (*RedisModule_GetKeyNameFromDefragCtx)(RedisModuleDefragCtx *ctx) REDISMODULE_ATTR;
-#endif
 
 #define RedisModule_IsAOFClient(id) ((id) == UINT64_MAX)
 
@@ -1198,8 +1194,6 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int
     REDISMODULE_GET_API(SetCommandKeySpecBeginSearchKeyword);
     REDISMODULE_GET_API(SetCommandKeySpecFindKeysRange);
     REDISMODULE_GET_API(SetCommandKeySpecFindKeysKeynum);
-
-#ifdef REDISMODULE_EXPERIMENTAL_API
     REDISMODULE_GET_API(GetThreadSafeContext);
     REDISMODULE_GET_API(GetDetachedThreadSafeContext);
     REDISMODULE_GET_API(FreeThreadSafeContext);
@@ -1271,7 +1265,6 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int
     REDISMODULE_GET_API(DefragCursorGet);
     REDISMODULE_GET_API(GetKeyNameFromDefragCtx);
     REDISMODULE_GET_API(GetDbIdFromDefragCtx);
-#endif
 
     if (RedisModule_IsModuleNameBusy && RedisModule_IsModuleNameBusy(name)) return REDISMODULE_ERR;
     RedisModule_SetModuleAttribs(ctx,name,ver,apiver);
diff --git a/tests/modules/aclcheck.c b/tests/modules/aclcheck.c
index e307744fd..fafb645a7 100644
--- a/tests/modules/aclcheck.c
+++ b/tests/modules/aclcheck.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 
 #include "redismodule.h"
 #include <errno.h>
diff --git a/tests/modules/auth.c b/tests/modules/auth.c
index b13c10385..959fb14f2 100644
--- a/tests/modules/auth.c
+++ b/tests/modules/auth.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 
 // A simple global user
diff --git a/tests/modules/basics.c b/tests/modules/basics.c
index dd2e0e165..4d639d682 100644
--- a/tests/modules/basics.c
+++ b/tests/modules/basics.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 #include <string.h>
 #include <stdlib.h>
diff --git a/tests/modules/blockedclient.c b/tests/modules/blockedclient.c
index 5df51f63d..3e97d6779 100644
--- a/tests/modules/blockedclient.c
+++ b/tests/modules/blockedclient.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 #include <assert.h>
 #include <stdio.h>
diff --git a/tests/modules/blockonbackground.c b/tests/modules/blockonbackground.c
index ced77862d..2e3b1a557 100644
--- a/tests/modules/blockonbackground.c
+++ b/tests/modules/blockonbackground.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 #define _XOPEN_SOURCE 700
 #include "redismodule.h"
 #include <stdio.h>
diff --git a/tests/modules/blockonkeys.c b/tests/modules/blockonkeys.c
index 72ccbcf38..4568b9fa8 100644
--- a/tests/modules/blockonkeys.c
+++ b/tests/modules/blockonkeys.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 
 #include <string.h>
diff --git a/tests/modules/commandfilter.c b/tests/modules/commandfilter.c
index a32ad051a..8ed779714 100644
--- a/tests/modules/commandfilter.c
+++ b/tests/modules/commandfilter.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 
 #include <string.h>
diff --git a/tests/modules/defragtest.c b/tests/modules/defragtest.c
index 1e4c810da..221280df1 100644
--- a/tests/modules/defragtest.c
+++ b/tests/modules/defragtest.c
@@ -1,7 +1,6 @@
 /* A module that implements defrag callback mechanisms.
  */
 
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 #include <stdlib.h>
 
diff --git a/tests/modules/fork.c b/tests/modules/fork.c
index 50889eef9..44e3971bd 100644
--- a/tests/modules/fork.c
+++ b/tests/modules/fork.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 
 /* define macros for having usleep */
 #define _BSD_SOURCE
diff --git a/tests/modules/getkeys.c b/tests/modules/getkeys.c
index 3f7cc56f0..acb8a1295 100644
--- a/tests/modules/getkeys.c
+++ b/tests/modules/getkeys.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 
 #include "redismodule.h"
 #include <strings.h>
diff --git a/tests/modules/keyspace_events.c b/tests/modules/keyspace_events.c
index 1cfeae998..152a2c48c 100644
--- a/tests/modules/keyspace_events.c
+++ b/tests/modules/keyspace_events.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define REDISMODULE_EXPERIMENTAL_API
 
 #include "redismodule.h"
 #include <stdio.h>
diff --git a/tests/modules/misc.c b/tests/modules/misc.c
index daed69952..94b4754ad 100644
--- a/tests/modules/misc.c
+++ b/tests/modules/misc.c
@@ -1,4 +1,3 @@
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 
 #include <string.h>
diff --git a/tests/modules/propagate.c b/tests/modules/propagate.c
index c234b0226..7560e94d2 100644
--- a/tests/modules/propagate.c
+++ b/tests/modules/propagate.c
@@ -37,7 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 #include <pthread.h>
 #include <errno.h>
diff --git a/tests/modules/timer.c b/tests/modules/timer.c
index d2a8d8e74..c9bd636c8 100644
--- a/tests/modules/timer.c
+++ b/tests/modules/timer.c
@@ -1,5 +1,4 @@
 
-#define REDISMODULE_EXPERIMENTAL_API
 #include "redismodule.h"
 
 static void timer_callback(RedisModuleCtx *ctx, void *data)