Remove of unnecessairy classes