Remove unused classes and fix plurals.