Remove Geometry::QUAD() usage in Toolkit