Escaped attribute cleanup