removed the manual maintenance of node list at three places and
automated this