removing this
simplifying
adding predicate mapping