Removing redundant class