Remove unused geometry_ member and getGeometry method