Removing defunt classes