Fix removing nodes