cleaning up new Z dictionary map