Remove unnecessary code on nodes
Merge branch 'Thanh'