Improved deletion behavior