Small geometry fixes and Polygon joining
Revert "Small geometry fixes and Polygon joining"

This reverts commit 9add9a1a17c97acf22bffaedfa98312d362a973f.