Remove hardcode to attributes