Node class cleanup