Extra classes removed