Remove and/or deprecate where applicable usage of artifacts from org.hibernate.criterion.