diff --git a/src/app/components/CountrySwitcher.tsx b/src/app/components/CountrySwitcher.tsx
deleted file mode 100644
index de8cf801..00000000
--- a/src/app/components/CountrySwitcher.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { AVAILABLE_COUNTRIES } from "../contents/data";
-
-interface Props {
-  country?: string;
-  switchCountry: (c: string) => void;
-}
-
-const countrySwitcher = ({ country, switchCountry }: Props): JSX.Element => {
-  return (
-    <div className="country-switcher">
-      <div className="dropdown">
-        <button
-          className="btn btn-secondary dropdown-toggle"
-          type="button"
-          id="dropdownMenuButton"
-          data-toggle="dropdown"
-          aria-haspopup="true"
-          aria-expanded="false"
-        >
-          {country ? "Switch" : "Select"} Country
-        </button>
-        <div className="dropdown-menu" aria-labelledby="dropdownMenuButton">
-          <div className="scroll">
-            {AVAILABLE_COUNTRIES &&
-              AVAILABLE_COUNTRIES.map((c) => (
-                <a
-                  key={c}
-                  className="dropdown-item"
-                  onClick={() => switchCountry(c)}
-                >
-                  {c}
-                </a>
-              ))}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default countrySwitcher;
diff --git a/src/app/components/EditorForm.jsx b/src/app/components/EditorForm.jsx
index 31f16cae..6470dddf 100644
--- a/src/app/components/EditorForm.jsx
+++ b/src/app/components/EditorForm.jsx
@@ -1,6 +1,5 @@
 import { DefaultTheme as Widgets } from "../form";
 import renderField from "../form/renderField";
-import CountrySwitcher from "./CountrySwitcher";
 import Collapse from "rc-collapse";
 import img_x from "../../asset/img/x.svg";
 import img_accordion_open from "../../asset/img/accordion-open.svg";
@@ -54,12 +53,10 @@ const renderHeader = (props) => {
 const renderBlocks = (
   blocks,
   activeSection,
-  countryProps,
   sectionsWithErrors,
   t
 ) => {
   return blocks.map((block, i) => {
-    const last = blocks.length === i + 1;
     const hasError = sectionsWithErrors.indexOf(i) >= 0;
     const c = {
       showArrow: false,
@@ -75,7 +72,6 @@ const renderBlocks = (
       ...c,
       label: renderHeader({ block, hasError, activeSection, t }),
       children: [
-        last && <CountrySwitcher key="cs" {...countryProps} />,
         <div className="block" key="div">
           {renderBlockItems(block.items, i, t)}
         </div>,
@@ -88,8 +84,6 @@ const EditorForm = (props) => {
   const {
     data,
     activeSection,
-    country,
-    switchCountry,
     allFields,
     submit,
     formMethods,
@@ -98,8 +92,6 @@ const EditorForm = (props) => {
   } = props;
   const { t } = useTranslation();
 
-  const countryProps = { country, switchCountry };
-
   const params = {
     accordion: true,
     defaultActiveKey: "0",
@@ -134,7 +126,6 @@ const EditorForm = (props) => {
               items={renderBlocks(
                 data,
                 activeSection,
-                countryProps,
                 sectionsWithErrors,
                 t
               )}
@@ -151,8 +142,6 @@ export default EditorForm;
 EditorForm.propTypes = {
   data: PropTypes.array.isRequired,
   activeSection: PropTypes.arrayOf(PropTypes.string),
-  country: PropTypes.string.isRequired,
-  // switchCountry: PropTypes.func.isRequired,
   allFields: PropTypes.array.isRequired,
   submit: PropTypes.func.isRequired,
   formMethods: PropTypes.object.isRequired,
diff --git a/src/asset/language_switcher.scss b/src/asset/language_switcher.scss
index f165388b..21db89b0 100644
--- a/src/asset/language_switcher.scss
+++ b/src/asset/language_switcher.scss
@@ -1,8 +1,3 @@
-.country-switcher {
-  min-height: 80px;
-  z-index: 999;
-}
-
 .language-switcher {
   display: flex;
   border-bottom: 1px solid #e8e8e8;
@@ -100,5 +95,4 @@ input[type="text"].language-filter__input {
   font-size: 18px;
   font-weight: 500;
   margin-left: -10px;
-  //text-transform: capitalize;
 }