diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/FlavourTaggingTests/PhysicsTriggerVariablePlots.h b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/FlavourTaggingTests/PhysicsTriggerVariablePlots.h
index 051175fdc79ba42dd3a873f4d2a99c2cd262ba2c..c14fd884caf55a9dd6486546c12daf38370a67ba 100644
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/FlavourTaggingTests/PhysicsTriggerVariablePlots.h
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/FlavourTaggingTests/PhysicsTriggerVariablePlots.h
@@ -41,8 +41,6 @@ namespace FTAGValidation {
     int m_nTotal_qualityOnlineJets;
 
   private:
-    SG::ReadHandleKey< xAOD::JetContainer >  m_trigJetKey  { this, "TrigJetCollectionKey", "",   
-	"Input Jet collection name" };
     SG::ReadHandleKey< xAOD::VertexContainer > m_trigVertexKey { this, "TrigVertexCollectionKey", "",
 	"Input Vertex collection name" };
     SG::ReadHandleKey< xAOD::TrackParticleContainer > m_trigTrackKey { this, "TrigTrackParticleCollectionKey", "",
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/python/FlavourTaggingConfiguration_PhysicsTriggerVariablePlots.py b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/python/FlavourTaggingConfiguration_PhysicsTriggerVariablePlots.py
index faa14349c843cc217a8927774364225a095245f5..3e732964733b71ee210f73f58bb106df8f8e4b67 100644
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/python/FlavourTaggingConfiguration_PhysicsTriggerVariablePlots.py
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/python/FlavourTaggingConfiguration_PhysicsTriggerVariablePlots.py
@@ -28,7 +28,6 @@ def getPhysicsTriggerVariablePlotsCfg():
     options = {}
     options['name'] = 'PhysicsTriggerVariablePlotsAlg'
     options['OutputLevel'] = INFO
-    options['TrigJetCollectionKey'] = 'HLT_bJets'
     options['TrigVertexCollectionKey'] = 'HLT_IDVertex_FS'
     options['TrigTrackParticleCollectionKey'] = 'HLT_IDTrack_Bjet_IDTrig'
     options['OfflineJetCollectionKey'] = 'AntiKt4EMPFlowJets'
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/src/PhysicsTriggerVariablePlots.cxx b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/src/PhysicsTriggerVariablePlots.cxx
index 31b83c5603dae899d260df0985a962f5dfa2b871..497e65b089fda095d09a98ca31aa9fded8dd6568 100644
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/src/PhysicsTriggerVariablePlots.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/src/PhysicsTriggerVariablePlots.cxx
@@ -31,7 +31,6 @@ namespace FTAGValidation {
     ATH_CHECK( FTAGValidationAlgorithm::initialize() );
 
     ATH_MSG_INFO( "Properties declaration:" );
-    ATH_MSG_INFO( "   -- " << m_trigJetKey      );
     ATH_MSG_INFO( "   -- " << m_trigVertexKey   );
     ATH_MSG_INFO( "   -- " << m_trigTrackKey    );
     ATH_MSG_INFO( "   -- " << m_offJetKey   );
@@ -42,7 +41,6 @@ namespace FTAGValidation {
     ATH_MSG_INFO( "   -- " << m_maxJetEta );
     ATH_MSG_INFO( "   -- " << m_minJetPt  );
 
-    ATH_CHECK( m_trigJetKey.initialize() );
     ATH_CHECK( m_trigVertexKey.initialize() );
     ATH_CHECK( m_trigTrackKey.initialize() );
     ATH_CHECK( m_offJetKey.initialize() );
@@ -121,7 +119,7 @@ namespace FTAGValidation {
       int nJetsWithMuon = 0;
       int nJetsWithSV   = 0;
 
-      std::vector< TrigCompositeUtils::LinkInfo<xAOD::JetContainer> > onlineJets = m_trigDec->features<xAOD::JetContainer>(chain, TrigDefs::Physics, m_trigJetKey.key());
+      std::vector< TrigCompositeUtils::LinkInfo<xAOD::JetContainer> > onlineJets = m_trigDec->features<xAOD::JetContainer>(chain, TrigDefs::Physics);
       ATH_MSG_DEBUG("onlineJets.size(): " << onlineJets.size() );
       int n_qualityJets = 0;
       for( const auto& jetLinkInfo : onlineJets ) {
@@ -133,8 +131,8 @@ namespace FTAGValidation {
 
         ATH_MSG_DEBUG( "JET KINEMATICS:" );
         ATH_MSG_DEBUG( "  ** pt=" << jet->p4().Et() / Gaudi::Units::GeV << " eta=" << jet->eta() << " phi=" << jet->phi() );
-        ATH_CHECK( fillHistogram( chain + "_jet_E"   , jet->e()   ) );
-        ATH_CHECK( fillHistogram( chain + "_jet_pT"  , jet->pt()  ) );
+        ATH_CHECK( fillHistogram( chain + "_jet_E"   , jet->e()  / Gaudi::Units::GeV ) );
+        ATH_CHECK( fillHistogram( chain + "_jet_pT"  , jet->pt() / Gaudi::Units::GeV ) );
         ATH_CHECK( fillHistogram( chain + "_jet_eta" , jet->eta() ) );
         ATH_CHECK( fillHistogram( chain + "_jet_phi" , jet->phi() ) );
 
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/src/PhysicsVariablePlots.cxx b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/src/PhysicsVariablePlots.cxx
index cf8cab88a73396d6ee0e6432646b5ee8fdd6aef1..a8a41ab093e227b288e01148dc00eb9ecd2703c7 100644
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/src/PhysicsVariablePlots.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/src/PhysicsVariablePlots.cxx
@@ -115,8 +115,8 @@ namespace FTAGValidation {
 		     " eta=" << jet->eta() <<
 		     " phi=" << jet->phi() );
 
-      ATH_CHECK( fillHistogram( "jet_E"   , jet->e()   ) );
-      ATH_CHECK( fillHistogram( "jet_pT"  , jet->pt()  ) );
+      ATH_CHECK( fillHistogram( "jet_E"   , jet->e()  / Gaudi::Units::GeV ) );
+      ATH_CHECK( fillHistogram( "jet_pT"  , jet->pt() / Gaudi::Units::GeV ) );
       ATH_CHECK( fillHistogram( "jet_eta" , jet->eta() ) );
       ATH_CHECK( fillHistogram( "jet_phi" , jet->phi() ) );
       //nMuons and nSV1