clean up of builder code