Remove old attribute and uniform schema