Cleaned up ugly legacy zone code