Fix regarding removing nodes