Remove hardcoded attribute class