config builder cleanup