Now removes disabled attribute if it's not in the schema