I've moved the removal into an asynchronous 'finally' block.