Remove hardcoded class name