remove old internal builder class