Clean up builder code.