Cleanup, but shapes are off from symbology (units issue)