Remove unused builder