Geometry cleanup