Merge "Remove hardcoded node numbering"