Cleanup Zone Editing

Fixes #3631