Geometry Cleanup

Clean up problematic areas on geometry.