Clean up zone.py