CXX-48 Remove useless builder base class