remove hacky location call