code clean and removing references to node paths