start fixing failures

move purge to better place
still need for delete