Legacy classes removed