Revert "ADD Location"

This reverts commit e6d175902239e5c8db6806fbc65138cfd9e0d58d.