Config cruft removal