Changes to removing methods of WorkspaceGroup. Re #6199