diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a2825f52812e9768d346e86409780a07ed172a88
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/CMakeLists.txt
@@ -0,0 +1,54 @@
+################################################################################
+# Package: UserAnalysis
+################################################################################
+
+# Declare the package name:
+atlas_subdir( UserAnalysis )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/AthenaBaseComps
+                          Control/StoreGate
+                          GaudiKernel
+                          PhysicsAnalysis/AnalysisCommon/AnalysisTools
+                          PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils
+                          Trigger/TrigAnalysis/TrigDecisionTool
+                          Trigger/TrigEvent/TrigCaloEvent
+                          Trigger/TrigEvent/TrigInDetEvent
+                          Trigger/TrigEvent/TrigMuonEvent
+                          Trigger/TrigEvent/TrigParticle
+                          PRIVATE
+                          Calorimeter/CaloEvent
+                          Event/NavFourMom
+                          Event/xAOD/xAODEventInfo
+                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
+                          PhysicsAnalysis/JetTagging/JetTagInfo
+                          PhysicsAnalysis/TruthParticleID/McParticleEvent
+                          Reconstruction/Jet/JetEvent
+                          Reconstruction/MissingETEvent
+                          Reconstruction/MuonIdentification/muonEvent
+                          Reconstruction/Particle
+                          Reconstruction/egamma/egammaEvent
+                          Reconstruction/tauEvent
+                          Tracking/TrkEvent/VxVertex
+                          Trigger/TrigEvent/TrigSteeringEvent )
+
+# External dependencies:
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Table MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
+
+# tag ROOTBasicLibs was not recognized in automatic conversion in cmt2cmake
+
+# tag ROOTSTLDictLibs was not recognized in automatic conversion in cmt2cmake
+
+# Component(s) in the package:
+atlas_add_component( UserAnalysis
+                     src/*.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps StoreGateLib SGtests GaudiKernel AthAnalysisToolsLib UserAnalysisUtilsLib TrigDecisionToolLib TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigParticle CaloEvent NavFourMom xAODEventInfo AnalysisTriggerEvent JetTagInfo McParticleEvent JetEvent MissingETEvent muonEvent Particle egammaEvent tauEvent VxVertex TrigSteeringEvent )
+
+# Install files from the package:
+atlas_install_headers( UserAnalysis )
+atlas_install_joboptions( share/*.py )
+
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/UserAnalysis/AnalysisSkeleton.h b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/UserAnalysis/AnalysisSkeleton.h
index 9d88bc75402fc7f20b83d87f47573d7f9217d0b8..c5c15c00c42583b33cac5d0b5cb7828384164898 100755
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/UserAnalysis/AnalysisSkeleton.h
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/UserAnalysis/AnalysisSkeleton.h
@@ -125,7 +125,7 @@ class AnalysisSkeleton : public AthAlgorithm  {
    ITHistSvc * m_thistSvc;
 
    /** a handle on Store Gate for access to the Event Store */
-   StoreGateSvc* m_storeGate;
+   //StoreGateSvc* m_storeGate;
 
    /** the key of the Electron Container to retrieve from the AOD */
    std::string m_electronContainerName; 
@@ -228,7 +228,7 @@ class AnalysisSkeleton : public AthAlgorithm  {
   std::vector<double>* m_aan_FinalElEta;
   std::vector<double>* m_aan_FinalElPt;
   std::vector<double>* m_aan_FinalElEtCone20;
-  std::vector<double>* m_aan_FinalElPtrat;
+  //std::vector<double>* m_aan_FinalElPtrat;
 
   std::vector<double>* m_aan_FinalMuEta;
   std::vector<double>* m_aan_FinalMuPt;
@@ -275,7 +275,7 @@ class AnalysisSkeleton : public AthAlgorithm  {
   unsigned int    m_lumiBlock;
   unsigned int    m_bCID;
   double  m_eventWeight;
-  unsigned int    m_statusElement;
+  //unsigned int    m_statusElement;
   /*
   unsigned int    m_lVL1ID;
   unsigned int    m_lvl1TriggerType;
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/AnalysisSkeleton.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/AnalysisSkeleton.cxx
index 48735d432259b7314f34d7a7ad881b67d7eed457..61181329a09b3695e0c6c5c5c13f834e543cc6e1 100755
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/AnalysisSkeleton.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/AnalysisSkeleton.cxx
@@ -86,8 +86,8 @@
 #include <functional>
 #include <iostream>
 
-static const double mZ = 91.19*CLHEP::GeV;
-static const int  MAX_PARTICLES = 20;
+//static const double mZ = 91.19*CLHEP::GeV;
+//static const int  MAX_PARTICLES = 20;
 
 using namespace Analysis;
 using namespace Rec;