Improved instance deletion support