Remove references to Zone