BNodePredicate cleaned up