More zone reference cleanup