Removed i4x tag from all Location(foo) calls