clean unused properties and add missing propertie