Remove Geometry structure and GEOMETRY signature with no compilation errors