Ckozak/regenerate less

Any ideas for better exceptions to catch for failed deletion due to another job hitting it first?