Clean up zone guardian MAI for inclusion in mainline