EZP-22930: remove duplicate criteria