Feature #2562: Remove unneeded code, oned will create a default zone