Refactor LocationHelp library reference resulting from rebase