Fix node cleanup