Remove boiler-plate code about node/instance names