node deletion consistency with custom nodes
refactoring