Improved delete performance