diff --git a/.env.example b/.env.example
index e98a5d8bfd..36f688e16e 100644
--- a/.env.example
+++ b/.env.example
@@ -48,7 +48,8 @@ GOOGLE_CLIENT_SECRET=
 
 # EMAIL CONFIGURATION
 DEFAULT_FROM_EMAIL=hello@tooljet.io
-SMTP_ENABLED=
+# Set this value true to get preview email on cevelopment env
+SMTP_DISABLED=
 SMTP_USERNAME=
 SMTP_PASSWORD=
 SMTP_DOMAIN=
@@ -89,5 +90,5 @@ DISABLE_APP_EMBED=
 # if true then private app embed is allowed
 ENABLE_PRIVATE_APP_EMBED=
 
-#Enable cors else restricted to TOOLJET_HOST
+#Enable cors else restricted to TOOLJET_HOST. Set the value true if you are serving front end from diffrent host
 ENABLE_CORS=
diff --git a/deploy/ec2/.env b/deploy/ec2/.env
index 38804d0031..98da2484a9 100644
--- a/deploy/ec2/.env
+++ b/deploy/ec2/.env
@@ -58,6 +58,3 @@ SSO_GOOGLE_OAUTH2_CLIENT_ID=
 SSO_GIT_OAUTH2_CLIENT_ID=
 SSO_GIT_OAUTH2_CLIENT_SECRET=
 SSO_GIT_OAUTH2_HOST=
-
-#Enable cors else restricted to TOOLJET_HOST
-ENABLE_CORS=true
diff --git a/server/src/main.ts b/server/src/main.ts
index ac9ddfa7f9..6f8f906ac5 100644
--- a/server/src/main.ts
+++ b/server/src/main.ts
@@ -78,11 +78,6 @@ async function bootstrap() {
     defaultVersion: VERSION_NEUTRAL,
   });
 
-  app.enableVersioning({
-    type: VersioningType.URI,
-    defaultVersion: VERSION_NEUTRAL,
-  });
-
   const listen_addr = process.env.LISTEN_ADDR || '::';
   const port = parseInt(process.env.PORT) || 3000;