[builder] clean up boilerplate