Zone info cleanup + delete improvements