diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index 0a68d142f6..34eec34e41 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -9,7 +9,6 @@ Do not use the `search-results-search` id elsewhere as it is used
 delete this element for pagefind/China users
 */}}
 
-{{/* From shortcodes/site-searchbar.html which is used in the home page */}}
 <div id="search-results-search" class="col-sm-6 col-md-6 col-lg-6 mx-auto py-3">
   {{partial "search-input" .}}
 </div>
diff --git a/layouts/index.html b/layouts/index.html
index 9d2d026333..94fb602f9a 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,11 +1,7 @@
 {{ define "main" }}
-{{ if .HasShortcode "site-searchbar" }}
-  {{ warnf "The homepage of the language %s is using a deprecated shortcode site-searchbar. Please remove the shortcode. No other step is needed." .Lang }}
-{{ else }}
 <div class="col-sm-6 col-md-6 col-lg-6 mx-auto py-3">
   {{partial "search-input" .}}
 </div>
-{{ end }}
 {{ .Content }}
 <section id="cncf">
     {{ partial "cncf.html" . }}
diff --git a/layouts/shortcodes/site-searchbar.html b/layouts/shortcodes/site-searchbar.html
deleted file mode 100644
index 4431089fa3..0000000000
--- a/layouts/shortcodes/site-searchbar.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="col-sm-6 col-md-6 col-lg-6 mx-auto py-3">
-{{partial "search-input" .}}
-</div>
\ No newline at end of file