Updated to latest OxPoints
Simplify shapes, ignore type