remove unwanted zone creation
added events support for zones
Merge branch 'refactor'