remove getCurrentZone usages