builder cleanup and registry integration