diff --git a/CHANGES.md b/CHANGES.md
index 184c02f0e8..5c3ab7703a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@
 * New OAuth logos
 * Minor fixes to the dark mode theme
 * Added JSON view for a project user
+* Removed setKey and setMode methods from all client SDKs
 
 ## Breaking Changes
 
diff --git a/app/sdks/flutter-dart/lib/client.dart b/app/sdks/flutter-dart/lib/client.dart
index ded033d2c5..90eb0bd6fe 100644
--- a/app/sdks/flutter-dart/lib/client.dart
+++ b/app/sdks/flutter-dart/lib/client.dart
@@ -53,25 +53,12 @@ class Client {
         return this;
     }
 
-     /// Your secret API key
-    Client setKey(value) {
-        config['key'] = value;
-        addHeader('X-Appwrite-Key', value);
-        return this;
-    }
-
     Client setLocale(value) {
         config['locale'] = value;
         addHeader('X-Appwrite-Locale', value);
         return this;
     }
 
-    Client setMode(value) {
-        config['mode'] = value;
-        addHeader('X-Appwrite-Mode', value);
-        return this;
-    }
-
     Client setSelfSigned({bool status = true}) {
         selfSigned = status;
         return this;
diff --git a/app/sdks/server-go/client.go b/app/sdks/server-go/client.go
index 36fb2f28e5..bd21f5f347 100644
--- a/app/sdks/server-go/client.go
+++ b/app/sdks/server-go/client.go
@@ -45,10 +45,6 @@ func (clt *Client) SetLocale(value string) {
 	clt.headers["X-Appwrite-Locale"] = value
 }
 
-func (clt *Client) SetMode(value string) {
-	clt.headers["X-Appwrite-Mode"] = value
-}
-
 // Call an API using Client
 func (clt *Client) Call(method string, path string, headers map[string]interface{}, params map[string]interface{}) (map[string]interface{}, error) {
 	if clt.client == nil {
diff --git a/app/sdks/server-java/src/main/java/Client.java b/app/sdks/server-java/src/main/java/Client.java
index 561acf51aa..51c52aebb5 100644
--- a/app/sdks/server-java/src/main/java/Client.java
+++ b/app/sdks/server-java/src/main/java/Client.java
@@ -78,12 +78,6 @@ public class Client {
         return this;
     }
 
-    public Client setMode(String value) {
-        config.put("mode", value);
-        addHeader("X-Appwrite-Mode", value);
-        return this;
-    }
-
     public Client setSelfSigned(boolean status) {
         selfSigned = status;
         return this;
diff --git a/app/sdks/server-nodejs/lib/client.js b/app/sdks/server-nodejs/lib/client.js
index 6fc349ea7a..024c4f1c5b 100644
--- a/app/sdks/server-nodejs/lib/client.js
+++ b/app/sdks/server-nodejs/lib/client.js
@@ -55,19 +55,6 @@ class Client {
         return this;
     }
 
-    /**
-     * Set Mode
-     *
-     * @param string value
-     *
-     * @return self
-     */
-    setMode(value) {
-        this.addHeader('X-Appwrite-Mode', value);
-
-        return this;
-    }
-
     /***
      * @param bool status
      * @return this
diff --git a/app/sdks/server-php/src/Appwrite/Client.php b/app/sdks/server-php/src/Appwrite/Client.php
index 36a9b85e33..21ca0bda1b 100644
--- a/app/sdks/server-php/src/Appwrite/Client.php
+++ b/app/sdks/server-php/src/Appwrite/Client.php
@@ -93,20 +93,6 @@ class Client
         return $this;
     }
 
-    /**
-     * Set Mode
-     *
-     * @param string $value
-     *
-     * @return Client
-     */
-    public function setMode($value)
-    {
-        $this->addHeader('X-Appwrite-Mode', $value);
-
-        return $this;
-    }
-
 
     /***
      * @param bool $status
diff --git a/app/sdks/server-python/appwrite/client.py b/app/sdks/server-python/appwrite/client.py
index 643e0ae0f0..d0e74de33d 100644
--- a/app/sdks/server-python/appwrite/client.py
+++ b/app/sdks/server-python/appwrite/client.py
@@ -38,10 +38,6 @@ class Client:
         self._global_headers['x-appwrite-locale'] = value.lower()
         return self
 
-    def set_mode(self, value):
-        self._global_headers['x-appwrite-mode'] = value.lower()
-        return self
-
     def call(self, method, path='', headers=None, params=None):
         if headers is None:
             headers = {}
diff --git a/app/sdks/server-ruby/lib/appwrite/client.rb b/app/sdks/server-ruby/lib/appwrite/client.rb
index ce15392c65..5e413cf6ae 100644
--- a/app/sdks/server-ruby/lib/appwrite/client.rb
+++ b/app/sdks/server-ruby/lib/appwrite/client.rb
@@ -43,12 +43,6 @@ module Appwrite
             return self
         end
 
-        def set_mode(value)
-            add_header('x-appwrite-mode', value)
-
-            return self
-        end
-
         def set_endpoint(endpoint)
             @endpoint = endpoint
             
diff --git a/app/sdks/web-javascript/src/sdk.js b/app/sdks/web-javascript/src/sdk.js
index 664f978ce1..4e8f1b0197 100644
--- a/app/sdks/web-javascript/src/sdk.js
+++ b/app/sdks/web-javascript/src/sdk.js
@@ -7,9 +7,7 @@
         let config = {
             endpoint: 'https://appwrite.io/v1',
             project: '',
-            key: '',
             locale: '',
-            mode: '',
         };
 
         /**
@@ -40,24 +38,6 @@
             return this;
         };
 
-        /**
-         * Set Key
-         *
-         * Your secret API key
-         *
-         * @param value string
-         *
-         * @return this
-         */
-        let setKey = function (value)
-        {
-            http.addGlobalHeader('X-Appwrite-Key', value);
-
-            config.key = value;
-
-            return this;
-        };
-
         /**
          * Set Locale
          *
@@ -74,22 +54,6 @@
             return this;
         };
 
-        /**
-         * Set Mode
-         *
-         * @param value string
-         *
-         * @return this
-         */
-        let setMode = function (value)
-        {
-            http.addGlobalHeader('X-Appwrite-Mode', value);
-
-            config.mode = value;
-
-            return this;
-        };
-
         let http = function(document) {
             let globalParams    = [],
                 globalHeaders   = [];
@@ -2142,9 +2106,7 @@
         return {
             setEndpoint: setEndpoint,
             setProject: setProject,
-            setKey: setKey,
             setLocale: setLocale,
-            setMode: setMode,
             account: account,
             avatars: avatars,
             database: database,
diff --git a/app/sdks/web-javascript/src/sdk.min.js b/app/sdks/web-javascript/src/sdk.min.js
index b2f00fac60..b2af28282a 100644
--- a/app/sdks/web-javascript/src/sdk.min.js
+++ b/app/sdks/web-javascript/src/sdk.min.js
@@ -1,4 +1,4 @@
-(function(window){'use strict';window.Appwrite=function(){let config={endpoint:'https://appwrite.io/v1',project:'',key:'',locale:'',mode:'',};let setEndpoint=function(endpoint){config.endpoint=endpoint;return this};let setProject=function(value){http.addGlobalHeader('X-Appwrite-Project',value);config.project=value;return this};let setKey=function(value){http.addGlobalHeader('X-Appwrite-Key',value);config.key=value;return this};let setLocale=function(value){http.addGlobalHeader('X-Appwrite-Locale',value);config.locale=value;return this};let setMode=function(value){http.addGlobalHeader('X-Appwrite-Mode',value);config.mode=value;return this};let http=function(document){let globalParams=[],globalHeaders=[];let addParam=function(url,param,value){let a=document.createElement('a'),regex=/(?:\?|&amp;|&)+([^=]+)(?:=([^&]*))*/g;let match,str=[];a.href=url;param=encodeURIComponent(param);while(match=regex.exec(a.search))if(param!==match[1])str.push(match[1]+(match[2]?"="+match[2]:""));str.push(param+(value?"="+encodeURIComponent(value):""));a.search=str.join("&");return a.href};let buildQuery=function(params){let str=[];for(let p in params){if(Array.isArray(params[p])){for(let index=0;index<params[p].length;index++){let param=params[p][index];str.push(encodeURIComponent(p+'[]')+"="+encodeURIComponent(param))}}else{str.push(encodeURIComponent(p)+"="+encodeURIComponent(params[p]))}}
+(function(window){'use strict';window.Appwrite=function(){let config={endpoint:'https://appwrite.io/v1',project:'',locale:'',};let setEndpoint=function(endpoint){config.endpoint=endpoint;return this};let setProject=function(value){http.addGlobalHeader('X-Appwrite-Project',value);config.project=value;return this};let setLocale=function(value){http.addGlobalHeader('X-Appwrite-Locale',value);config.locale=value;return this};let http=function(document){let globalParams=[],globalHeaders=[];let addParam=function(url,param,value){let a=document.createElement('a'),regex=/(?:\?|&amp;|&)+([^=]+)(?:=([^&]*))*/g;let match,str=[];a.href=url;param=encodeURIComponent(param);while(match=regex.exec(a.search))if(param!==match[1])str.push(match[1]+(match[2]?"="+match[2]:""));str.push(param+(value?"="+encodeURIComponent(value):""));a.search=str.join("&");return a.href};let buildQuery=function(params){let str=[];for(let p in params){if(Array.isArray(params[p])){for(let index=0;index<params[p].length;index++){let param=params[p][index];str.push(encodeURIComponent(p+'[]')+"="+encodeURIComponent(param))}}else{str.push(encodeURIComponent(p)+"="+encodeURIComponent(params[p]))}}
 return str.join("&")};let addGlobalHeader=function(key,value){globalHeaders[key]={key:key.toLowerCase(),value:value.toLowerCase()}};let addGlobalParam=function(key,value){globalParams.push({key:key,value:value})};addGlobalHeader('x-sdk-version','appwrite:javascript:1.0.29');addGlobalHeader('content-type','');let call=function(method,path,headers={},params={},progress=null){let i;path=config.endpoint+path;if(-1===['GET','POST','PUT','DELETE','TRACE','HEAD','OPTIONS','CONNECT','PATCH'].indexOf(method)){throw new Error('var method must contain a valid HTTP method name')}
 if(typeof path!=='string'){throw new Error('var path must be of type string')}
 if(typeof headers!=='object'){throw new Error('var headers must be of type object')}
@@ -165,4 +165,4 @@ if(userId===undefined){throw new Error('Missing required parameter: "userId"')}
 if(secret===undefined){throw new Error('Missing required parameter: "secret"')}
 let path='/teams/{teamId}/memberships/{inviteId}/status'.replace(new RegExp('{teamId}','g'),teamId).replace(new RegExp('{inviteId}','g'),inviteId);let payload={};if(userId){payload.userId=userId}
 if(secret){payload.secret=secret}
-return http.patch(path,{'content-type':'application/json',},payload)}};return{setEndpoint:setEndpoint,setProject:setProject,setKey:setKey,setLocale:setLocale,setMode:setMode,account:account,avatars:avatars,database:database,locale:locale,storage:storage,teams:teams}};if(typeof module!=="undefined"){module.exports=window.Appwrite}})((typeof window!=="undefined")?window:{})
\ No newline at end of file
+return http.patch(path,{'content-type':'application/json',},payload)}};return{setEndpoint:setEndpoint,setProject:setProject,setLocale:setLocale,account:account,avatars:avatars,database:database,locale:locale,storage:storage,teams:teams}};if(typeof module!=="undefined"){module.exports=window.Appwrite}})((typeof window!=="undefined")?window:{})
\ No newline at end of file
diff --git a/app/sdks/web-javascript/types/index.d.ts b/app/sdks/web-javascript/types/index.d.ts
index 7ddfd77a15..638f15d2dd 100644
--- a/app/sdks/web-javascript/types/index.d.ts
+++ b/app/sdks/web-javascript/types/index.d.ts
@@ -27,16 +27,6 @@ declare class Appwrite {
      * @return this
      */
     setProject(project: string): this;
-	/**
-	 * Set Key
-	 *
-         * Your secret API key
-	 *
-     * @param value string
-     *
-     * @return this
-     */
-    setKey(key: string): this;
 	/**
 	 * Set Locale
 	 *
@@ -45,14 +35,6 @@ declare class Appwrite {
      * @return this
      */
     setLocale(locale: string): this;
-	/**
-	 * Set Mode
-	 *
-     * @param value string
-     *
-     * @return this
-     */
-    setMode(mode: string): this;
 
 	account:Appwrite.Account;
 	avatars:Appwrite.Avatars;
diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml
index 390c90d32e..d71dd99dff 100644
--- a/app/views/console/webhooks/index.phtml
+++ b/app/views/console/webhooks/index.phtml
@@ -105,8 +105,8 @@ $events = [
                             <label data-ls-attrs="for=security-{{task.$id}}" class="margin-bottom-small">
                                 <div class="margin-bottom-small text-bold">SSL / TLS (Certificate verification)</div>
                                         
-                                <input name="security" type="radio" required data-ls-attrs="id=secure-yes-{{webhook.$id}}" data-ls-bind="{{webhook.security}}" value="1" /> &nbsp; <span>Enabled</span>
-                                <input name="security" type="radio" required data-ls-attrs="id=secure-no-{{webhook.$id}}" data-ls-bind="{{webhook.security}}" value="0" /> &nbsp; <span>Disabled</span>
+                                <input name="security" type="radio" required data-ls-attrs="id=secure-yes-{{webhook.$id}}" data-ls-bind="{{webhook.security}}" value="1" /> &nbsp; <span>Enabled</span> &nbsp;
+                                <input name="security" type="radio" required data-ls-attrs="id=secure-no-{{webhook.$id}}" data-ls-bind="{{webhook.security}}" value="0" /> &nbsp; <span>Disabled</span> &nbsp;
                             </label>
 
                             <p class="margin-bottom text-size-small text-fade"><span class="text-red">Warning</span>: Untrusted or self-signed certificates may not be secure.
@@ -219,8 +219,8 @@ $events = [
                     <label data-ls-attrs="for=security-{{task.$id}}" class="margin-bottom-small">
                         <div class="margin-bottom-small text-bold">SSL / TLS (Certificate verification)</div>
                                         
-                        <input name="security" type="radio" required data-ls-attrs="id=secure-yes" checked="checked" value="1" /> &nbsp; <span>Enabled</span>
-                        <input name="security" type="radio" required data-ls-attrs="id=secure-no" value="0" /> &nbsp; <span>Disabled</span>
+                        <input name="security" type="radio" required data-ls-attrs="id=secure-yes" checked="checked" value="1" /> &nbsp; <span>Enabled</span> &nbsp;
+                        <input name="security" type="radio" required data-ls-attrs="id=secure-no" value="0" /> &nbsp; <span>Disabled</span> &nbsp;
                     </label>
 
                     <p class="margin-bottom text-size-small text-fade"><span class="text-red">Warning</span>: Untrusted or self-signed certificates may not be secure.