Remove Quad, not in scope at this point. Fixes #8