Remove unneeded Node member. Some refactoring.