refactoring
moving unused node