removed unused class
builder added