diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 1c59f821..f38acc29 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -909,40 +909,53 @@ Value Eval::evaluate(const Position& pos) {
 /// trace() is like evaluate(), but instead of returning a value, it returns
 /// a string (suitable for outputting to stdout) that contains the detailed
 /// descriptions and values of each evaluation term. Useful for debugging.
+/// Trace scores are from white's point of view
 
 std::string Eval::trace(const Position& pos) {
 
   if (pos.checkers())
-      return "Total evaluation: none (in check)";
-
-  std::memset(scores, 0, sizeof(scores));
-
-  pos.this_thread()->contempt = SCORE_ZERO; // Reset any dynamic contempt
-
-  Value v = Evaluation<TRACE>(pos).value();
-
-  v = pos.side_to_move() == WHITE ? v : -v; // Trace scores are from white's point of view
+      return "Final evaluation: none (in check)";
 
   std::stringstream ss;
-  ss << std::showpoint << std::noshowpos << std::fixed << std::setprecision(2)
-     << "     Term    |    White    |    Black    |    Total   \n"
-     << "             |   MG    EG  |   MG    EG  |   MG    EG \n"
-     << " ------------+-------------+-------------+------------\n"
-     << "    Material | " << Term(MATERIAL)
-     << "   Imbalance | " << Term(IMBALANCE)
-     << "       Pawns | " << Term(PAWN)
-     << "     Knights | " << Term(KNIGHT)
-     << "     Bishops | " << Term(BISHOP)
-     << "       Rooks | " << Term(ROOK)
-     << "      Queens | " << Term(QUEEN)
-     << "    Mobility | " << Term(MOBILITY)
-     << " King safety | " << Term(KING)
-     << "     Threats | " << Term(THREAT)
-     << "      Passed | " << Term(PASSED)
-     << "       Space | " << Term(SPACE)
-     << "    Winnable | " << Term(WINNABLE)
-     << " ------------+-------------+-------------+------------\n"
-     << "       Total | " << Term(TOTAL);
+  ss << std::showpoint << std::noshowpos << std::fixed << std::setprecision(2);
+
+  Value v;
+
+  if (pos.use_nnue())
+  {
+    v = NNUE::evaluate(pos);
+  }
+  else
+  {
+    std::memset(scores, 0, sizeof(scores));
+
+    pos.this_thread()->contempt = SCORE_ZERO; // Reset any dynamic contempt
+
+    v = Evaluation<TRACE>(pos).value();
+
+    ss << std::showpoint << std::noshowpos << std::fixed << std::setprecision(2)
+       << "     Term    |    White    |    Black    |    Total   \n"
+       << "             |   MG    EG  |   MG    EG  |   MG    EG \n"
+       << " ------------+-------------+-------------+------------\n"
+       << "    Material | " << Term(MATERIAL)
+       << "   Imbalance | " << Term(IMBALANCE)
+       << "       Pawns | " << Term(PAWN)
+       << "     Knights | " << Term(KNIGHT)
+       << "     Bishops | " << Term(BISHOP)
+       << "       Rooks | " << Term(ROOK)
+       << "      Queens | " << Term(QUEEN)
+       << "    Mobility | " << Term(MOBILITY)
+       << " King safety | " << Term(KING)
+       << "     Threats | " << Term(THREAT)
+       << "      Passed | " << Term(PASSED)
+       << "       Space | " << Term(SPACE)
+       << "    Winnable | " << Term(WINNABLE)
+       << " ------------+-------------+-------------+------------\n"
+       << "       Total | " << Term(TOTAL);
+
+  }
+
+  v = pos.side_to_move() == WHITE ? v : -v;
 
   ss << "\nFinal evaluation: " << to_cp(v) << " (white side)\n";
 
diff --git a/src/uci.cpp b/src/uci.cpp
index 08d93e07..eaf020fa 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -290,8 +290,6 @@ void UCI::loop(int argc, char* argv[]) {
       else if (token == "d")        sync_cout << pos << sync_endl;
       else if (token == "eval")     sync_cout << Eval::trace(pos) << sync_endl;
       else if (token == "compiler") sync_cout << compiler_info() << sync_endl;
-      else if (token == "evalnn")   sync_cout << "NNUE evaluation: "
-                                    << Eval::NNUE::compute_eval(pos) << sync_endl;
       else
           sync_cout << "Unknown command: " << cmd << sync_endl;