Removed defunt class