Also remove the actual os name from the hierachy of classes