Remove config variables (pending in API changes)
Add config addon if not added before