remove system match, add .z.XX