Remove dead code, rename builder method