Improved deletion, remove unused include