Cleanup code of zone-serial feature