Remove output
Fix numbering of nodes for generated node