Remove unnecessary code on nodes