More cleanups to the node classes groups rake tasks.