remove log in point location
Some refactoring