Better node deletion behaviour