remove old unused builder class