Location refactoring

In last two commits I removed Wrong old version dependencies and removed parts where we need an higher level of logic.