builder cleanup