Oops, I had all 3 delete statements independently wrapped in catch blocks before, but had removed it while testing the memory issues and forgot to put them back, sorry.
I committed to oacs-5-1 because it's a bug fix and not a new feature, so I thought that would be ok. Will coordinate with you next time.