location views: remove unused code
Merge branch 'master' into test