uws-eresearch/ADELTA#18 - cleanup