diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/SearchOrcidController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/SearchOrcidController.java
deleted file mode 100644
index 46683a7312b..00000000000
--- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/SearchOrcidController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.orcid.frontend.web.controllers;
-
-import javax.annotation.Resource;
-
-import org.orcid.core.manager.v3.OrcidSearchManager;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.ModelAndView;
-
-@Controller("searchOrcidController")
-@RequestMapping(value = "/orcid-search")
-public class SearchOrcidController extends BaseController {
-
-    @Resource(name = "orcidSearchManagerV3")
-    private OrcidSearchManager orcidSearchManager;
-
-    public void setOrcidSearchManager(OrcidSearchManager orcidSearchManager) {
-        this.orcidSearchManager = orcidSearchManager;
-    }
-
-    @RequestMapping(value = "/search", method = RequestMethod.GET)
-    public ModelAndView buildSearchView() {
-        ModelAndView mav = new ModelAndView("advanced_search");
-        if (!domainsAllowingRobots.contains(orcidUrlManager.getBaseDomainRmProtocall())) {
-            mav.addObject("noIndex", true);
-        }
-        return mav;
-    }
-
-    @RequestMapping(value = "/quick-search")
-    public ModelAndView quickSearch() {
-        ModelAndView mav = new ModelAndView("quick_search");
-        if (!domainsAllowingRobots.contains(orcidUrlManager.getBaseDomainRmProtocall())) {
-            mav.addObject("noIndex", true);
-        }
-        return mav;
-    }
-
-}
diff --git a/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header/header.component.ts b/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header/header.component.ts
index 64bc1a33590..23ba427871c 100644
--- a/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header/header.component.ts
+++ b/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header/header.component.ts
@@ -179,10 +179,7 @@ export class HeaderComponent implements AfterViewInit, OnDestroy, OnInit {
           );
         }
         if (this.headerSearch.searchOption == "registry") {
-          let searchUrl = "/orcid-search/quick-search/?searchQuery=";
-          if (this.ngOrcidSearch) {
-            searchUrl = "/orcid-search/search?searchQuery=";
-          }
+          let searchUrl = "/orcid-search/search?searchQuery=";
           window.location.assign(
             getBaseUri() +
               searchUrl +
diff --git a/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts b/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts
index 332607b05ca..fdb4e2d4bed 100644
--- a/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts
+++ b/orcid-web/src/main/webapp/static/javascript/ng1Orcid/app/modules/header2/header2.component.ts
@@ -137,16 +137,9 @@ export class Header2Component  {
                 window.location.assign(getBaseUri() + '/search/node/' + encodeURIComponent(this.headerSearch.searchInput));
             }
             if(this.headerSearch.searchOption=='registry'){
-                if (this.togglzOrcidAngularSearch) {
-                    window.location.assign(getBaseUri()
-                    + "/orcid-search/search?searchQuery="
-                    + encodeURIComponent(this.headerSearch.searchInput));
-                }
-                else {
-                    window.location.assign(getBaseUri()
-                    + "/orcid-search/quick-search/?searchQuery="
-                    + encodeURIComponent(this.headerSearch.searchInput)); 
-                }
+                window.location.assign(getBaseUri()
+                + "/orcid-search/search?searchQuery="
+                + encodeURIComponent(this.headerSearch.searchInput));                
             }
         }
     }