Cleanup node group and class assignment