#217 Clean up Zo2Path