revert rest of zone changes
removing pylint violations