Predicate cleanup