Geometry Cleanup

Cleanup problematic areas on geometry.