remove delivery from BPR and calculation
Merge pull request #4208 from dimagi/remove-delivery

remove delivery from BPR and calculation