remove unused classes, addresses #1424