Cleanup in the configuration builders