Remove legacy code

Removing code that has been refactored and is now unused.
Bug fix and removal of legacy code

Initial search now works when location is auto filled by browser
location.