cleanup, better zone handling