diff --git a/EvtGenModels/EvtbTosllScalarAmp.hh b/EvtGenModels/EvtbTosllScalarAmp.hh
index dfe36f6..b578b85 100644
--- a/EvtGenModels/EvtbTosllScalarAmp.hh
+++ b/EvtGenModels/EvtbTosllScalarAmp.hh
@@ -1,46 +1,46 @@
 //--------------------------------------------------------------------------
 //
 // Environment:
 //      This software is part of the EvtGen package developed jointly
 //      for the BaBar and CLEO collaborations.  If you use all or part
 //      of it, please give an appropriate acknowledgement.
 //
 // Copyright Information: See EvtGen/COPYRIGHT
 //      Copyright (C) 1998      Caltech, UCSB
 //
 // Module: EvtGen/EvtbTosllScalarAmp.hh
 //
 // Description:
 //
 // Modification history:
 //
 //    RYD     January 5, 2000         Module created
 //
 //------------------------------------------------------------------------
 
 #ifndef EVTBTOSLLSCALARAMP_HH
 #define EVTBTOSLLSCALARAMP_HH
 
 #include "EvtGenModels/EvtbTosllAmp.hh"
 class EvtParticle;
 class EvtAmp;
 class bTosllFF;
 
 class EvtbTosllScalarAmp : public EvtbTosllAmp {
 
 public:
 
- EvtbTosllScalarAmp(double c7, double c9, double c10):_c7(c7),_c9(c9),_c10(c10){}
+ //EvtbTosllScalarAmp(double c7, double c9, double c10):_c7(c7),_c9(c9),_c10(c10){}
 
   //Daughters are initialized and have been added to the parent.
   //No need to carry around the daughters seperately!
   void CalcAmp( EvtParticle *parent, EvtAmp& amp,
 		EvtbTosllFF *formFactors ) override;
 
 private:
-  double _c7,_c9,_c10;
+  //double _c7,_c9,_c10;
 
 };
 
 #endif
 
diff --git a/EvtGenModels/EvtbTosllVectorAmp.hh b/EvtGenModels/EvtbTosllVectorAmp.hh
index 6f5b043..1c27a23 100644
--- a/EvtGenModels/EvtbTosllVectorAmp.hh
+++ b/EvtGenModels/EvtbTosllVectorAmp.hh
@@ -1,47 +1,47 @@
 //--------------------------------------------------------------------------
 //
 // Environment:
 //      This software is part of the EvtGen package developed jointly
 //      for the BaBar and CLEO collaborations.  If you use all or part
 //      of it, please give an appropriate acknowledgement.
 //
 // Copyright Information: See EvtGen/COPYRIGHT
 //      Copyright (C) 1998      Caltech, UCSB
 //
 // Module: EvtGen/EvtbTosllVectorAmp.hh
 //
 // Description:
 //
 // Modification history:
 //
 //    RYD     January 5, 2000         Module created
 //
 //------------------------------------------------------------------------
 
 #ifndef EVTBTOSLLVECTORAMP_HH
 #define EVTBTOSLLVECTORAMP_HH
 
 #include "EvtGenModels/EvtbTosllAmp.hh"
 
 class EvtAmp;
 class EvtParticle;
 class EvtbTosllFF;
 
 class EvtbTosllVectorAmp : public EvtbTosllAmp {
 
 public:
 
-  EvtbTosllVectorAmp(double c7, double c9, double c10):_c7(c7),_c9(c9),_c10(c10){}
+  //EvtbTosllVectorAmp(double c7, double c9, double c10):_c7(c7),_c9(c9),_c10(c10){}
 
   //Daughters are initialized and have been added to the parent.
   //No need to carry around the daughters seperately!
   void CalcAmp( EvtParticle *parent, EvtAmp& amp,
 		EvtbTosllFF *formFactors ) override;
 
 private:
 
-  double _c7,_c9,_c10;
+  //double _c7,_c9,_c10;
 
 };
 
 #endif
diff --git a/src/EvtGenModels/EvtbTosllAli.cpp b/src/EvtGenModels/EvtbTosllAli.cpp
index b5b1695..0a4c3d4 100644
--- a/src/EvtGenModels/EvtbTosllAli.cpp
+++ b/src/EvtGenModels/EvtbTosllAli.cpp
@@ -1,114 +1,114 @@
 //--------------------------------------------------------------------------
 //
 // Environment:
 //      This software is part of the EvtGen package developed jointly
 //      for the BaBar and CLEO collaborations.  If you use all or part
 //      of it, please give an appropriate acknowledgement.
 //
 // Copyright Information: See EvtGen/COPYRIGHT
 //      Copyright (C) 2003      Caltech, UCSB
 //
 // Module: EvtbTosllAli.cc
 //
 // Description: Routine to implement b->sll decays according to Ali '02 et al.
 //
 // Modification history:
 //
 //    Ryd     March 30, 2003        Module created
 //
 //------------------------------------------------------------------------
 //
 #include "EvtGenBase/EvtPatches.hh"
 #include <stdlib.h>
 #include "EvtGenBase/EvtParticle.hh"
 #include "EvtGenBase/EvtGenKine.hh"
 #include "EvtGenBase/EvtPDL.hh"
 #include "EvtGenBase/EvtReport.hh"
 #include "EvtGenModels/EvtbTosllAli.hh"
 #include "EvtGenModels/EvtbTosllAliFF.hh"
 #include "EvtGenModels/EvtbTosllAmp.hh"
 #include "EvtGenModels/EvtbTosllScalarAmp.hh"
 #include "EvtGenModels/EvtbTosllVectorAmp.hh"
 
 #include <string>
 using std::endl;
 
 std::string EvtbTosllAli::getName(){
 
   return "BTOSLLALI";
 }
 
 
 EvtDecayBase* EvtbTosllAli::clone(){
 
   return new EvtbTosllAli;
 
 }
 
 void EvtbTosllAli::decay( EvtParticle *p ){
 
   setWeight(p->initializePhaseSpace(getNDaug(),getDaugs(),false,
                                     _poleSize,1,2));
 
   _calcamp->CalcAmp(p,_amp2,_aliffmodel.get());
 
 }
 
 
 void EvtbTosllAli::initProbMax(){
 
   EvtId parnum,mesnum,l1num,l2num;
 
   parnum = getParentId();
   mesnum = getDaug(0);
   l1num = getDaug(1);
   l2num = getDaug(2);
 
   //This routine sets the _poleSize.
   double mymaxprob = _calcamp->CalcMaxProb(parnum,mesnum,
 					   l1num,l2num,
 					   _aliffmodel.get(),_poleSize);
 
   setProbMax(mymaxprob);
 
 }
 
 
 void EvtbTosllAli::init(){
 
   checkNArg(0);
   checkNDaug(3);
 
   //We expect the parent to be a scalar
   //and the daughters to be X lepton+ lepton-
 
   checkSpinParent(EvtSpinType::SCALAR);
 
   EvtSpinType::spintype mesontype=EvtPDL::getSpinType(getDaug(0));
 
   if ( !(mesontype == EvtSpinType::VECTOR||
 	mesontype == EvtSpinType::SCALAR)) {
     EvtGenReport(EVTGEN_ERROR,"EvtGen") << "EvtbTosllAli generator expected "
                            << " a SCALAR or VECTOR 1st daughter, found:"<<
                            EvtPDL::name(getDaug(0)).c_str()<<endl;
     EvtGenReport(EVTGEN_ERROR,"EvtGen") << "Will terminate execution!"<<endl;
     ::abort();
   }
 
   checkSpinDaughter(1,EvtSpinType::DIRAC);
   checkSpinDaughter(2,EvtSpinType::DIRAC);
 
   _aliffmodel = std::make_unique<EvtbTosllAliFF>();
   if (mesontype == EvtSpinType::SCALAR){
-    _calcamp = std::make_unique<EvtbTosllScalarAmp>(-0.313,4.344,-4.669);
+    _calcamp = std::make_unique<EvtbTosllScalarAmp>();
   }
   if (mesontype == EvtSpinType::VECTOR){
-    _calcamp = std::make_unique<EvtbTosllVectorAmp>(-0.313,4.344,-4.669);
+    _calcamp = std::make_unique<EvtbTosllVectorAmp>();
   }
 
 }
 
 
 
 
 
diff --git a/src/EvtGenModels/EvtbTosllBall.cpp b/src/EvtGenModels/EvtbTosllBall.cpp
index 8497065..29c7ddf 100644
--- a/src/EvtGenModels/EvtbTosllBall.cpp
+++ b/src/EvtGenModels/EvtbTosllBall.cpp
@@ -1,140 +1,140 @@
 //--------------------------------------------------------------------------
 //
 // Environment:
 //      This software is part of the EvtGen package developed jointly
 //      for the BaBar and CLEO collaborations.  If you use all or part
 //      of it, please give an appropriate acknowledgement.
 //
 // Copyright Information: See EvtGen/COPYRIGHT
 //      Copyright (C) 2000      Caltech, UCSB
 //
 // Module: EvtbTosllBall.cc
 //
 // Description: Routine to implement b->sll decays according to Ball et al.
 //
 // Modification history:
 //
 //    Ryd     January 5, 2000        Module created
 //
 //    jjhollar October 7, 2005       Option to select form factors at runtime
 //------------------------------------------------------------------------
 //
 #include "EvtGenBase/EvtPatches.hh"
 #include <stdlib.h>
 #include "EvtGenBase/EvtParticle.hh"
 #include "EvtGenBase/EvtGenKine.hh"
 #include "EvtGenBase/EvtPDL.hh"
 #include "EvtGenBase/EvtReport.hh"
 #include "EvtGenModels/EvtbTosllBall.hh"
 #include "EvtGenModels/EvtbTosllBallFF.hh"
 #include "EvtGenModels/EvtbTosllAmp.hh"
 #include "EvtGenModels/EvtbTosllScalarAmp.hh"
 #include "EvtGenModels/EvtbTosllVectorAmp.hh"
 
 #include <string>
 using std::endl;
 
 
 std::string EvtbTosllBall::getName(){
 
   return "BTOSLLBALL";
 }
 
 
 EvtDecayBase* EvtbTosllBall::clone(){
 
   return new EvtbTosllBall;
 
 }
 
 void EvtbTosllBall::decay( EvtParticle *p ){
 
   setWeight(p->initializePhaseSpace(getNDaug(),getDaugs(),false,
                                     _poleSize,1,2));
 
   _calcamp->CalcAmp(p,_amp2,_ballffmodel.get());
 
 }
 
 
 void EvtbTosllBall::initProbMax(){
 
   EvtId parnum,mesnum,l1num,l2num;
 
   parnum = getParentId();
   mesnum = getDaug(0);
   l1num = getDaug(1);
   l2num = getDaug(2);
 
   //This routine sets the _poleSize.
   double mymaxprob = _calcamp->CalcMaxProb(parnum,mesnum,
 					   l1num,l2num,
 					   _ballffmodel.get(),_poleSize);
 
   setProbMax(mymaxprob);
 
 }
 
 
 void EvtbTosllBall::init(){
 
   // First choose form factors from the .DEC file
   // 1 = Ali-Ball '01 LCSR
   // 2 = Ali-Ball '99 LCSR
   // 3 = Colangelo 3pt QCD
   // 4 = Melikhov Lattice/Quark dispersion
   // 5 = ???
   // 6 = Ball-Zwicky '05 LCSR (mb = 480)
   // 7 = Ball-Zwicky '05 LCSR (mb = 460 - pseudoscalar modes only)
 
   // The default is Ali '01
   int theFormFactorModel = 1;
 
   if(getNArg() == 1)
     theFormFactorModel = (int)getArg(0);
 
   checkNDaug(3);
 
   //We expect the parent to be a scalar
   //and the daughters to be X lepton+ lepton-
 
   checkSpinParent(EvtSpinType::SCALAR);
 
   EvtSpinType::spintype mesontype=EvtPDL::getSpinType(getDaug(0));
 
   if ( !(mesontype == EvtSpinType::VECTOR||
 	mesontype == EvtSpinType::SCALAR)) {
     EvtGenReport(EVTGEN_ERROR,"EvtGen") << "EvtbTosllBall generator expected "
                            << " a SCALAR or VECTOR 1st daughter, found:"<<
                            EvtPDL::name(getDaug(0)).c_str()<<endl;
     EvtGenReport(EVTGEN_ERROR,"EvtGen") << "Will terminate execution!"<<endl;
     ::abort();
   }
 
   checkSpinDaughter(1,EvtSpinType::DIRAC);
   checkSpinDaughter(2,EvtSpinType::DIRAC);
 
   _ballffmodel = std::make_unique<EvtbTosllBallFF>(theFormFactorModel);
   if (mesontype == EvtSpinType::SCALAR){
-    _calcamp = std::make_unique<EvtbTosllScalarAmp>(-0.313,4.344,-4.669);
+    _calcamp = std::make_unique<EvtbTosllScalarAmp>();
   } else if (mesontype == EvtSpinType::VECTOR){
-    _calcamp = std::make_unique<EvtbTosllVectorAmp>(-0.313,4.344,-4.669);
+    _calcamp = std::make_unique<EvtbTosllVectorAmp>();
   }
 
 }