Cleaning up geometry