clean up builder tests
remove old internal builder class
cleanup