[#21] Remove #wdn_search_form overrides
[#21] Remove other unneeded overrides