Unused classes removed