Removed dead class [SW]