Eliminated builder (no need for it any more)