uws-eresearch/ADELTA#12 - cleanup