Removing class names to avoid confusion