remove older internal builder code
builder tests