Revert "I made some changes in the NodeSystem while assuming the nodes will become bunch of finish lines."

This reverts commit 7d79a84c7310dc3aa77287a79a65dea940ece746.