delete repeatables & change editables
Merge branch 'develop'