ZoneManager type cleanup