Redundant class removed