Clean up Geometry