Remove legacy redesign search artifacts
Merge pull request #2052 from darkwing/remove-legacy-search

Remove legacy redesign search artifacts