moved location code, so the if/else remains for remove and location is only checked if remove is not true. Besides the location, the code has not been changed
moved location code, so the if/else remains for remove and location is only checked if remove is not true. Besides the location, the code has not been changed

dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq