diff --git a/packages/piro/cmake/Piro_config.hpp.in b/packages/piro/cmake/Piro_config.hpp.in
index 8acaed395d34..3e8bd4d6be72 100644
--- a/packages/piro/cmake/Piro_config.hpp.in
+++ b/packages/piro/cmake/Piro_config.hpp.in
@@ -33,11 +33,9 @@
#cmakedefine HAVE_PIRO_STOKHOS
/* DEPRECATED */
#cmakedefine Piro_ENABLE_Stokhos
-#ifndef OPTIPACK_HIDE_DEPRECATED_CODE
#cmakedefine HAVE_PIRO_OPTIPACK
/* DEPRECATED */
#cmakedefine Piro_ENABLE_OptiPack
-#endif // !OPTIPACK_HIDE_DEPRECATED_CODE
#cmakedefine HAVE_PIRO_TRIKOTA
/* DEPRECATED */
#cmakedefine Piro_ENABLE_TriKota
diff --git a/packages/piro/src/Piro_PerformAnalysis.hpp b/packages/piro/src/Piro_PerformAnalysis.hpp
index 6481b7cb000d..8e4f26ba009f 100644
--- a/packages/piro/src/Piro_PerformAnalysis.hpp
+++ b/packages/piro/src/Piro_PerformAnalysis.hpp
@@ -49,11 +49,9 @@
#include "Thyra_ModelEvaluatorDefaultBase.hpp"
#include "Thyra_VectorStdOps.hpp"
-#ifndef OPTIPACK_HIDE_DEPRECATED_CODE
#ifdef HAVE_PIRO_OPTIPACK
#include "OptiPack_Config.h"
#endif
-#endif
namespace Piro {
diff --git a/packages/piro/test/Main_AnalysisDriver.cpp b/packages/piro/test/Main_AnalysisDriver.cpp
index 0dab6c65b60b..7039eaeb9c16 100644
--- a/packages/piro/test/Main_AnalysisDriver.cpp
+++ b/packages/piro/test/Main_AnalysisDriver.cpp
@@ -57,6 +57,10 @@
#include "Teuchos_StandardCatchMacros.hpp"
#include "Piro_ConfigDefs.hpp"
+#ifdef HAVE_PIRO_OPTIPACK
+#include "OptiPack_Config.h"
+#endif
+
int main(int argc, char *argv[]) {
diff --git a/packages/piro/test/_input_Analysis_Dakota.xml b/packages/piro/test/_input_Analysis_Dakota.xml
index 6f6814eed22a..130345fc4364 100644
--- a/packages/piro/test/_input_Analysis_Dakota.xml
+++ b/packages/piro/test/_input_Analysis_Dakota.xml
@@ -156,15 +156,5 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/piro/test/_input_Analysis_MOOCHO.xml b/packages/piro/test/_input_Analysis_MOOCHO.xml
index d1ec47f03357..eaccbd0fcc04 100644
--- a/packages/piro/test/_input_Analysis_MOOCHO.xml
+++ b/packages/piro/test/_input_Analysis_MOOCHO.xml
@@ -163,15 +163,5 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/piro/test/_input_Analysis_ROL.xml b/packages/piro/test/_input_Analysis_ROL.xml
index 797253d1ea78..60b77eaf68e3 100644
--- a/packages/piro/test/_input_Analysis_ROL.xml
+++ b/packages/piro/test/_input_Analysis_ROL.xml
@@ -303,15 +303,5 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities.xml b/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities.xml
index dbefe2686bbd..1ae60b8a9c33 100644
--- a/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities.xml
+++ b/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities.xml
@@ -304,15 +304,5 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_Tpetra.xml b/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_Tpetra.xml
index bc7f53927112..1ef894854cd5 100644
--- a/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_Tpetra.xml
+++ b/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_Tpetra.xml
@@ -304,15 +304,5 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/piro/test/_input_Analysis_ROL_Tpetra.xml b/packages/piro/test/_input_Analysis_ROL_Tpetra.xml
index 65f822ffdfe6..3594a4a70dbc 100644
--- a/packages/piro/test/_input_Analysis_ROL_Tpetra.xml
+++ b/packages/piro/test/_input_Analysis_ROL_Tpetra.xml
@@ -303,15 +303,5 @@
-
-
-
-
-
-
-
-
-
-