Revert "added location NS"

This reverts commit 6141956d68a345ec9398024d51fdb62db9139045.