diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2af8e9e7..4d9d91e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,7 @@ endif (qt_based_tools)
 #--- if NeXus check also for HDF4, HDF5, and MXML -----------------------------
 if (nexus)
   find_package(HDF5 COMPONENTS CXX REQUIRED )
-#//as35  find_package(HDF4 REQUIRED)
+  find_package(HDF4 REQUIRED)
   find_package(NeXus REQUIRED)
   add_definitions(-DPNEXUS_ENABLED)
 endif (nexus)
@@ -271,7 +271,7 @@ endif (NOT CUDA_FOUND AND NOT OpenCL_FOUND AND NOT DKS_FOUND)
 
 if (nexus)
   message("")
-#//as35  message(" HDF4   found in ${HDF4_INCLUDE_DIRS}")
+  message(" HDF4   found in ${HDF4_INCLUDE_DIRS}")
   message(" HDF5    found in ${HDF5_INCLUDE_DIRS}")
   message(" NeXus   found in ${NEXUS_INCLUDE_DIR}") 
 endif (nexus)
diff --git a/src/musredit_qt5/mupp/CMakeLists.txt b/src/musredit_qt5/mupp/CMakeLists.txt
index 34868248..d0a65d2c 100644
--- a/src/musredit_qt5/mupp/CMakeLists.txt
+++ b/src/musredit_qt5/mupp/CMakeLists.txt
@@ -49,7 +49,6 @@ set(MUPP_SOURCE_FILES
   PmuppScript.cpp 
   PmuppGui.cpp
   PVarDialog.cpp
-#as35  PGetNormValDialog.cpp
 )
 
 if (APPLE)
diff --git a/src/musredit_qt5/mupp/PmuppGui.cpp b/src/musredit_qt5/mupp/PmuppGui.cpp
index 011340ff..0a186853 100644
--- a/src/musredit_qt5/mupp/PmuppGui.cpp
+++ b/src/musredit_qt5/mupp/PmuppGui.cpp
@@ -596,13 +596,6 @@ void PmuppGui::setupToolActions()
   fNormalizeAction->setCheckable(true);
   connect( fNormalizeAction, SIGNAL( changed() ), this, SLOT( normalize() ) );
   menu->addAction(fNormalizeAction);
-
-/* //as35 - eventually also remove PGetNormValDialog.* from the source
-  a = new QAction(tr( "Normalize by Value" ), this);
-  a->setStatusTip( tr("Normalize by Value") );
-  connect( a, SIGNAL( triggered() ), this, SLOT( normVal() ) );
-  menu->addAction(a);
-*/
 }
 
 //-----------------------------------------------------------------------------
@@ -1858,7 +1851,6 @@ void PmuppGui::createMacro()
       QMessageBox::critical(this, "**ERROR**", msg);
       return;
     }
-//as35    xx = fParamDataHandler->GetValues(collName, xLabel);
     getMinMax(xx, xMin, xMax);
     // a couple of x-vector specifics
     if ((xLabel == "dataT") || (xLabel == "dataE"))
@@ -1876,21 +1868,18 @@ void PmuppGui::createMacro()
         QMessageBox::critical(this, "**ERROR**", msg);
         return;
       }
-//as35      yy = fParamDataHandler->GetValues(collName, yLabel);
       yyPosErr = getPosErr(collName, yLabel, ok);
       if (!ok) {
         QString msg = QString("Couldn't get y-axis pos. error data from '%1', coll: '%2'").arg(yLabel).arg(collName);
         QMessageBox::critical(this, "**ERROR**", msg);
         return;
       }
-//as35      yyPosErr = fParamDataHandler->GetPosErr(collName, yLabel);
       yyNegErr = getNegErr(collName, yLabel, ok);
       if (!ok) {
         QString msg = QString("Couldn't get y-axis neg. error data from '%1', coll: '%2'").arg(yLabel).arg(collName);
         QMessageBox::critical(this, "**ERROR**", msg);
         return;
       }
-//as35      yyNegErr = fParamDataHandler->GetNegErr(collName, yLabel);
       yLabel = substituteDefaultLabels(yLabel);
       getMinMax(yy, yMin, yMax);
       // create TGraph objects
@@ -2051,7 +2040,6 @@ void PmuppGui::plot()
       QMessageBox::critical(this, "**ERROR**", msg);
       return;
     }
-//as35    xx = fParamDataHandler->GetValues(collName, xLabel);
 
     xLabel = substituteDefaultLabels(xLabel);
     fout << "xLabel: " << xLabel << ", ";
@@ -2067,7 +2055,6 @@ void PmuppGui::plot()
         QMessageBox::critical(this, "**ERROR**", msg);
         return;
       }
-//as35      yy = fParamDataHandler->GetValues(collName, yLabel);
       yyy.push_back(yy);
       yyPosErr = getPosErr(collName, yLabel, ok);
       if (!ok) {
@@ -2075,7 +2062,6 @@ void PmuppGui::plot()
         QMessageBox::critical(this, "**ERROR**", msg);
         return;
       }
-//as35      yyPosErr = fParamDataHandler->GetPosErr(collName, yLabel);
       yyyPosErr.push_back(yyPosErr);
       yyNegErr = getNegErr(collName, yLabel, ok);
       if (!ok) {
@@ -2083,7 +2069,6 @@ void PmuppGui::plot()
         QMessageBox::critical(this, "**ERROR**", msg);
         return;
       }
-//as35      yyNegErr = fParamDataHandler->GetNegErr(collName, yLabel);
       yyyNegErr.push_back(yyNegErr);
       yLabel = substituteDefaultLabels(yLabel);
       fout << "yLabel: " << yLabel << ", ";
@@ -2100,7 +2085,6 @@ void PmuppGui::plot()
       QMessageBox::critical(this, "**ERROR**", msg);
       return;
     }
-//as35    yy = fParamDataHandler->GetValues(collName, yLabel);
     yyy.push_back(yy);
     yyPosErr = getPosErr(collName, yLabel, ok);
     if (!ok) {
@@ -2108,7 +2092,6 @@ void PmuppGui::plot()
       QMessageBox::critical(this, "**ERROR**", msg);
       return;
     }
-//as35    yyPosErr = fParamDataHandler->GetPosErr(collName, yLabel);
     yyyPosErr.push_back(yyPosErr);
     yyNegErr = getNegErr(collName, yLabel, ok);
     if (!ok) {
@@ -2116,7 +2099,6 @@ void PmuppGui::plot()
       QMessageBox::critical(this, "**ERROR**", msg);
       return;
     }
-//as35    yyNegErr = fParamDataHandler->GetNegErr(collName, yLabel);
     yyyNegErr.push_back(yyNegErr);
 
     yLabel = substituteDefaultLabels(yLabel);
diff --git a/src/musredit_qt5/mupp/PmuppScript.cpp b/src/musredit_qt5/mupp/PmuppScript.cpp
index a6fc260a..55648ea5 100644
--- a/src/musredit_qt5/mupp/PmuppScript.cpp
+++ b/src/musredit_qt5/mupp/PmuppScript.cpp
@@ -312,10 +312,6 @@ int PmuppScript::addX(const QString str)
         foundInColl = false;
         collName = coll->GetName();
         break;
-/* //as35
-        std::cerr << std::endl << "**ERROR** couldn't find '" << label.toLatin1().constData() << "' in collection '" << coll->GetName().toLatin1().constData() << "'" << std::endl << std::endl;
-        return -4;
-*/ //as35
       }
     }
     // second check variables
@@ -350,10 +346,6 @@ int PmuppScript::addX(const QString str)
     if (!foundLabel(coll, label)) { // label not found
       foundInColl = false;
       collName = coll->GetName();
-/* //as35
-      std::cerr << std::endl << "**ERROR** couldn't find '" << label.toLatin1().constData() << "' in collection '" << coll->GetName().toLatin1().constData() << "'" << std::endl << std::endl;
-      return -4;
-*/ //as35
     }
     // second check variables
     if (!foundVariable(label)) { // label not found
@@ -412,10 +404,6 @@ int PmuppScript::addY(const QString str)
           collName = coll->GetName();
           idx = j;
           break;
-/* //as35
-          std::cerr << std::endl << "**ERROR** couldn't find '" << label[j].toLatin1().constData() << "' in collection '" << coll->GetName().toLatin1().constData() << "'" << std::endl << std::endl;
-          return -4;
-*/ //as35
         }
       }
     }
@@ -459,10 +447,6 @@ int PmuppScript::addY(const QString str)
         collName = coll->GetName();
         idx = i;
         break;
-/* //as35
-        std::cerr << std::endl << "**ERROR** couldn't find '" << label[i].toLatin1().constData() << "' in collection '" << coll->GetName().toLatin1().constData() << "'" << std::endl << std::endl;
-        return -4;
-*/ //as35
       }
     }
     // second check variables