diff --git a/Framework/DataObjects/src/LeanElasticPeak.cpp b/Framework/DataObjects/src/LeanElasticPeak.cpp
index 3ea6bec0d0a37f7c85535c596e85db8ebe25f811..cd65b12812d70e7d50168a2b70776be5a4b50f9b 100644
--- a/Framework/DataObjects/src/LeanElasticPeak.cpp
+++ b/Framework/DataObjects/src/LeanElasticPeak.cpp
@@ -112,7 +112,10 @@ void LeanElasticPeak::setDetectorID(int) {
 
 //----------------------------------------------------------------------------------------------
 /** Get the ID of the detector at the center of the peak  */
-int LeanElasticPeak::getDetectorID() const { return -1; }
+int LeanElasticPeak::getDetectorID() const {
+  throw Exception::NotImplementedError(
+      "LeanElasticPeak::getDetectorID(): no detector ID on LeanElasticPeak");
+}
 
 //----------------------------------------------------------------------------------------------
 /** Set the instrument (and save the source/sample pos).
@@ -161,7 +164,8 @@ double LeanElasticPeak::getWavelength() const { return m_wavelength; }
  * peak,
  * using the geometry of the detector  */
 double LeanElasticPeak::getTOF() const {
-  return std::numeric_limits<double>::quiet_NaN();
+  throw Exception::NotImplementedError(
+      "LeanElasticPeak::getTOF(): no detector infomation in LeanElasticPeak");
 }
 
 // -------------------------------------------------------------------------------------
diff --git a/Framework/DataObjects/src/LeanElasticPeaksWorkspace.cpp b/Framework/DataObjects/src/LeanElasticPeaksWorkspace.cpp
index 8caa280db11c1bfb7bfbff415d4c529fab58ca23..ab003c988b13ce4099e52fd8ec286cdbfeb2e70a 100644
--- a/Framework/DataObjects/src/LeanElasticPeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/LeanElasticPeaksWorkspace.cpp
@@ -403,25 +403,19 @@ LeanElasticPeaksWorkspace::createDetectorTable() const {
 void LeanElasticPeaksWorkspace::initColumns() {
   // Note: The column types are controlled in PeakColumn.cpp
   addPeakColumn("RunNumber");
-  addPeakColumn("DetID");
   addPeakColumn("h");
   addPeakColumn("k");
   addPeakColumn("l");
   addPeakColumn("Wavelength");
   addPeakColumn("Energy");
-  addPeakColumn("TOF");
   addPeakColumn("DSpacing");
   addPeakColumn("Intens");
   addPeakColumn("SigInt");
   addPeakColumn("Intens/SigInt");
   addPeakColumn("BinCount");
-  addPeakColumn("BankName");
-  addPeakColumn("Row");
-  addPeakColumn("Col");
   addPeakColumn("QLab");
   addPeakColumn("QSample");
   addPeakColumn("PeakNumber");
-  addPeakColumn("TBar");
 }
 
 //---------------------------------------------------------------------------------------------
diff --git a/Framework/DataObjects/test/LeanElasticPeakTest.h b/Framework/DataObjects/test/LeanElasticPeakTest.h
index 67dc1f5745888122d43f82f64f9c88fe756605b7..83f14ee56e53a97f6a8a96045247331d9b07a9b8 100644
--- a/Framework/DataObjects/test/LeanElasticPeakTest.h
+++ b/Framework/DataObjects/test/LeanElasticPeakTest.h
@@ -38,7 +38,7 @@ public:
     TS_ASSERT_EQUALS(p.getQSampleFrame(), V3D(0, 0, 0))
     TS_ASSERT_EQUALS(p.getQLabFrame(), V3D())
 
-    TS_ASSERT_EQUALS(p.getDetectorID(), -1)
+    TS_ASSERT_THROWS(p.getDetectorID(), const Exception::NotImplementedError &)
     TS_ASSERT_THROWS(p.getDetector(), const Exception::NotImplementedError &)
     TS_ASSERT_THROWS(p.getInstrument(), const Exception::NotImplementedError &)
     TS_ASSERT_THROWS(p.findDetector(), const Exception::NotImplementedError &)
@@ -48,7 +48,7 @@ public:
                      const Exception::NotImplementedError &)
     TS_ASSERT_THROWS(p.getDetPos(), const Exception::NotImplementedError &)
     TS_ASSERT_THROWS(p.getSamplePos(), const Exception::NotImplementedError &)
-    TS_ASSERT(std::isnan(p.getTOF()))
+    TS_ASSERT_THROWS(p.getTOF(), const Exception::NotImplementedError &)
     TS_ASSERT_EQUALS(p.getScattering(), 0.)
     TS_ASSERT_EQUALS(p.getAzimuthal(), -M_PI)
     TS_ASSERT_THROWS(p.getL1(), const Exception::NotImplementedError &)
diff --git a/Framework/DataObjects/test/LeanElasticPeaksWorkspaceTest.h b/Framework/DataObjects/test/LeanElasticPeaksWorkspaceTest.h
index d2818405042d9d922e1cc789341c618296ac1101..f848bf5353005ff73f4a39d7b7365e2ff2823696 100644
--- a/Framework/DataObjects/test/LeanElasticPeaksWorkspaceTest.h
+++ b/Framework/DataObjects/test/LeanElasticPeaksWorkspaceTest.h
@@ -41,7 +41,7 @@ public:
     LeanElasticPeak p(V3D(1, 0, 0), 3.0);
     pw->addPeak(p);
 
-    TS_ASSERT_EQUALS(pw->columnCount(), 20);
+    TS_ASSERT_EQUALS(pw->columnCount(), 14);
     TS_ASSERT_EQUALS(pw->rowCount(), 1);
     TS_ASSERT_EQUALS(pw->getNumberPeaks(), 1);
     TS_ASSERT_DELTA(pw->getPeak(0).getWavelength(), 3.0, 1e-9);