Remove references to MeterGeometry