diff --git a/Control/AthContainersInterfaces/AthContainersInterfaces/ATLAS_CHECK_THREAD_SAFETY b/Control/AthContainersInterfaces/AthContainersInterfaces/ATLAS_CHECK_THREAD_SAFETY
old mode 100755
new mode 100644
diff --git a/Control/AthenaExamples/ToyConversion/ToyConversion/ATLAS_CHECK_THREAD_SAFETY b/Control/AthenaExamples/ToyConversion/ToyConversion/ATLAS_CHECK_THREAD_SAFETY
old mode 100644
new mode 100755
diff --git a/Control/AthenaKernel/AthenaKernel/ATLAS_CHECK_THREAD_SAFETY b/Control/AthenaKernel/AthenaKernel/ATLAS_CHECK_THREAD_SAFETY
old mode 100755
new mode 100644
diff --git a/Control/CLIDComps/src/ATLAS_CHECK_THREAD_SAFETY b/Control/CLIDComps/src/ATLAS_CHECK_THREAD_SAFETY
old mode 100755
new mode 100644
diff --git a/Control/CxxUtils/CxxUtils/ATLAS_CHECK_THREAD_SAFETY b/Control/CxxUtils/CxxUtils/ATLAS_CHECK_THREAD_SAFETY
old mode 100644
new mode 100755
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValPFO.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValPFO.cxx
index 1a7c2aa0f7cf6b17e4907e8a3150ae9ee8fec0eb..0efae73a673bf37bdde918278567d719779b073e 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValPFO.cxx
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/PhysValPFO.cxx
@@ -72,16 +72,6 @@ StatusCode PhysValPFO::fillHistograms(){
 	}//If we have a vertex of type primary vertex
       }//iterate over the vertices and check their type
 
-      if (nullptr == theVertex) {
-	ATH_MSG_VERBOSE("Could not find a primary vertex in this event " );
-	for (auto vertex : (*m_vertexContainerReadHandle.ptr())) {
-	  if (xAOD::VxType::NoVtx == theVertex->vertexType() ) {
-	    theVertex = vertex;
-	    break;
-	  }//if vertex of type NoVtx found
-	}//iterate over the vertices and check their type
-      }//if did not find PrimaryVertex
-
       if (nullptr == theVertex) ATH_MSG_WARNING("Did not find either a PriVtx or a NoVtx in this event");
       
     }//if valid read handle