diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/L1TdrStgcTriggerLogic.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/L1TdrStgcTriggerLogic.h
index 3d9a180aa221012b9ffdde333ceb9b77f79a9791..83c9602c430d54c5cac15540d9466cb78e93a2bf 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/L1TdrStgcTriggerLogic.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/L1TdrStgcTriggerLogic.h
@@ -104,7 +104,7 @@ class L1TdrStgcTriggerLogic {
         MsgStream& msgStream(){return m_msg;}
         
     private:
-        TRandom rand;
+        TRandom m_rand;
         std::vector< SectorTriggerCandidate > m_secTrigCand;        
         bool m_writePickle; /// after computing the triggers, write the canditates to 'pickle' files (for event display)
         std::string m_picklePrefix; /// path where the pickle files will be written
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h
index 0bd5f5da03cb566c7ebc6c2e6df1a677bbbf04c2..d525325b40f0e22cd27a7ce9bd3c07db3617b89f 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h
@@ -120,12 +120,6 @@ namespace NSWL1 {
     std::vector<int> *m_cl_layer;
     std::vector<int> *m_cl_bandId;
 
-    //Cache that holds which strips to read based on bandid
-    // 2d-vector for eta/phi station coordinates
-    // map from BandID to a set of strips
-    
-    std::vector< std::vector < std::map<uint16_t, std::set<int> > > > *bandID_cache ;
-    //std::vector< std::vector<std::unique_ptr<StripData> >* > m_clusters;
     std::vector< std::shared_ptr<std::vector<std::unique_ptr<StripData> >>  > m_clusters;
   };  // end of StripClusterTool class
 
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/L1TdrStgcTriggerLogic.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/L1TdrStgcTriggerLogic.cxx
index 0d90a12666c71be5b0c545b92e5c70a2a6ec7088..0d3b18fbeba013fe3a96cfdd7d3cf0a6eb4dc2da 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/L1TdrStgcTriggerLogic.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/L1TdrStgcTriggerLogic.cxx
@@ -164,9 +164,9 @@ namespace NSWL1{
             patternEta.push_back(sl3.at(0));
             patternEta.push_back(sl4.at(0));
 
-            int    multipletid ;
-            int    moduleid ;
-            int    sectortype ;
+            int    multipletid = 0;
+            int    moduleid = 0;
+            int    sectortype = 0;
 
 //Please mind the indentation
             if (sl1 == "11") {
@@ -305,7 +305,7 @@ namespace NSWL1{
         std::vector< size_t > out;
         out.reserve(padIndices.size());
         for (size_t i = 0; i < padIndices.size(); ++i) {
-            if (rand.Uniform(1) < padTimingEfficiency)
+            if (m_rand.Uniform(1) < padTimingEfficiency)
             out.push_back(padIndices.at(i));
         }
         return out;
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTdsOfflineTool.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTdsOfflineTool.cxx
index c175aa0f169efd6bf68b594b9c01282c4078a582..3d267f5a008552fb2857afdaf95a361f89946653 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTdsOfflineTool.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTdsOfflineTool.cxx
@@ -474,11 +474,6 @@ namespace NSWL1 {
     //------------------------------------------------------------------------------
     void PadTdsOfflineTool::printStgcGeometryFromAgdd() const
     {
-        if(true) {
-            const std::vector<AGDDDetector*> &stgcList = AGDDDetectorStore::GetDetectorStore()->GetDetectorsByType("sTGC");
-            std::vector<AGDDDetector*>::const_iterator it = stgcList.begin();
-            std::vector<AGDDDetector*>::const_iterator end = stgcList.end();
-        }
     }
     //------------------------------------------------------------------------------
     bool PadTdsOfflineTool::is_pad_digit(const sTgcDigit* digit) const
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/PadWithHits.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/PadWithHits.cxx
index 9a1fe12ad784a218f087ce5f47abdf96b1ce2992..651a70735af7b0a94602b33e98e5e9b7a583bb6d 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/PadWithHits.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/PadWithHits.cxx
@@ -109,7 +109,7 @@ namespace NSWL1 {
 
   PadWithHits::PadWithHits(const int &ieta, const int &iphi,
                            const int &multiplet,
-                           const int &l, const int &sector, const int &sectortype, const int &side, const int &module) :
+                           const int &l, const int &sector, const int &/*sectortype*/, const int &side, const int &module) :
     Pad(ieta, iphi, multiplet, l, sector, side, module),
     m_totEnergy(0.), m_avgEta(0.), m_avgPhi(0.),
     m_minEta(FLT_MAX), m_minPhi(FLT_MAX), m_maxEta(FLT_MIN), m_maxPhi(FLT_MIN)
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/StripTdsOfflineTool.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/StripTdsOfflineTool.cxx
index aa2bc88fd9f634b2e1df7e112460e5a9fb52dea7..d9d427ebec81f6839fc14b3c7f0384ac2722e985 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/StripTdsOfflineTool.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/StripTdsOfflineTool.cxx
@@ -473,7 +473,7 @@ namespace NSWL1 {
 
 
 	  bool read_strip=false;
-	  bool _tmp=false;
+	  bool tmp=false;
 	  for( const auto& p : padTriggers){
 	    //	    if(p->sectorId()!=stationPhi)
 	    //  {
@@ -485,9 +485,9 @@ namespace NSWL1 {
 	      ATH_MSG_DEBUG(" ReadStrip Trigger Candidate in different side " << p->sideId() << "  " <<strip->sideId() );
 	      continue;
 	    }
-	    _tmp=readStrip(p->bandId(),strip.get(),p->m_pad_strip_info); //this readStrip is the function
-	    if( _tmp and read_strip) ATH_MSG_DEBUG("Multiple pad trigger candidate in a single wedge for strip "<<read_strip );
-	    read_strip=read_strip || _tmp;
+	    tmp=readStrip(p->bandId(),strip.get(),p->m_pad_strip_info); //this readStrip is the function
+	    if( tmp and read_strip) ATH_MSG_DEBUG("Multiple pad trigger candidate in a single wedge for strip "<<read_strip );
+	    read_strip=read_strip || tmp;
 	  }
 
 	  if (read_strip && strip->bandId() ==-1){