Add failed predicates to predicate trace; remove unused codes