Removed defunt classes