diff --git a/src/THcScintillatorPlane.cxx b/src/THcScintillatorPlane.cxx
index 66abaae179be4cf64a9c14a3a4a17e1aebafcbf4..3740dd2b2a6212ba441ece513997a61b75a6920d 100644
--- a/src/THcScintillatorPlane.cxx
+++ b/src/THcScintillatorPlane.cxx
@@ -216,8 +216,8 @@ if(hit->fTDC_pos >  0) {
 	THcSignalHit *sighit = (THcSignalHit*) fPosTDCHits->ConstructedAt(nPosTDCHits++);
 	sighit->Set(hit->fCounter, hit->fTDC_pos);
 #else
-TObjrct* obj = (*fPoaTDCHits)[nPosTDCHits++];
-R_ASSERT( obj );
+TObject* obj = (*fPosTDCHits)[nPosTDCHits++];
+R__ASSERT( obj );
 if(!obj->TestBit (TObject::kNotDeleted))
 fPosTDCHitsClass->New(obj);
 THcSignalHit *sighit = (THcSignalHit*)obj;
@@ -231,8 +231,8 @@ if(hit->fTDC_neg >  0) {
 	THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nNegTDCHits++);
 	sighit->Set(hit->fCounter, hit->fTDC_neg);
 #else
-	TObjrct* obj = (*fPoaTDCHits)[nNegTDCHits++];
-	R_ASSERT( obj );
+	TObject* obj = (*fPosTDCHits)[nNegTDCHits++];
+	R__ASSERT( obj );
 if(!obj->TestBit (TObject::kNotDeleted))
 	fNegTDCHitsClass->New(obj);
 	THcSignalHit *sighit = (THcSignalHit*)obj;
@@ -245,8 +245,8 @@ if(hit->fADC_pos >  0) {
 	THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++);
 	sighit->Set(hit->fCounter, hit->fADC_pos);
 #else
-	TObjrct* obj = (*fPoaTDCHits)[nPosADCHits++];
-	R_ASSERT( obj );
+	TObject* obj = (*fPosTDCHits)[nPosADCHits++];
+	R__ASSERT( obj );
 if(!obj->TestBit (TObject::kNotDeleted))
 	fPosADCHitsClass->New(obj);
 	THcSignalHit *sighit = (THcSignalHit*)obj;
@@ -259,8 +259,8 @@ if(hit->fADC_neg >  0) {
 	THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
 	sighit->Set(hit->fCounter, hit->fADC_neg);
 #else
-	TObjrct* obj = (*fPoaTDCHits)[nNegADCHits++];
-	R_ASSERT( obj );
+	TObject* obj = (*fPosTDCHits)[nNegADCHits++];
+	R__ASSERT( obj );
 if(!obj->TestBit (TObject::kNotDeleted))
 	fNegADCHitsClass->New(obj);
 	THcSignalHit *sighit = (THcSignalHit*)obj;
@@ -268,91 +268,6 @@ if(!obj->TestBit (TObject::kNotDeleted))
    sighit->Set(hit->fCounter, hit->fADC_neg);
 }
 
-/*
- if(hit->fTDC_pos >  0) {
- #if ROOT_VERSION_CODE >= ROOT_VERSION(5,32,0)
-      THcSignalHit *sighit = (THcSignalHit*) fPosTDCHits->ConstructedAt(nPosTDCHits++);
-      sighit->Set(hit->fCounter, hit->fTDC_pos);
- #else
-  // The essence of the ConstructedAt code explictly
-    TObject* obj = (*fPosTDCHits)[nPosTDCHits++];
-    R__ASSERT( obj );  // should never happen ...
-    if( !obj->TestBit(TObject::kNotDeleted) )
-      fPosTDCHitsClass->New(obj);
-    THcSignalHit *sighit = (THcSignalHit*) obj;
- #endif
-    sighit->Set(hit->fCounter, hit->fTDC_pos);
-    }
- */
- /*
-    if(hit->fTDC_neg >  0) {
- #if ROOT_VERSION_CODE >= ROOT_VERSION(5,32,0)
-      THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nNegTDCHits++);
-      sighit->Set(hit->fCounter, hit->fTDC_neg);
- #else
-  // The essence of the ConstructedAt code explictly
-    TObject* obj = (*fNegTDCHits)[nNegTDCHits++];
-    R__ASSERT( obj );  // should never happen ...
-    if( !obj->TestBit(TObject::kNotDeleted) )
-      fNegTDCHitsClass->New(obj);
-    THcSignalHit *sighit = (THcSignalHit*) obj;
- #endif
-    sighit->Set(hit->fCounter, hit->fTDC_neg);
-    }
- 
- 
-  if(hit->fADC_pos >  0) {
- #if ROOT_VERSION_CODE >= ROOT_VERSION(5,32,0)
-      THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nPosADCHits++);
-      sighit->Set(hit->fCounter, hit->fADC_pos);
- #else
-  // The essence of the ConstructedAt code explictly
-    TObject* obj = (*fPosADCHits)[nPosADCHits++];
-    R__ASSERT( obj );  // should never happen ...
-    if( !obj->TestBit(TObject::kNotDeleted) )
-      fPosADCHitsClass->New(obj);
-    THcSignalHit *sighit = (THcSignalHit*) obj;
- #endif
-    sighit->Set(hit->fCounter, hit->fADC_pos);
-    }
- 
- if(hit->fADC_neg >  0) {
- #if ROOT_VERSION_CODE >= ROOT_VERSION(5,32,0)
-      THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
-      sighit->Set(hit->fCounter, hit->fTDC_neg);
- #else
-  // The essence of the ConstructedAt code explictly
-    TObject* obj = (*fNegADCHits)[nNegADCHits++];
-    R__ASSERT( obj );  // should never happen ...
-    if( !obj->TestBit(TObject::kNotDeleted) )
-      fNegADCHitsClass->New(obj);
-    THcSignalHit *sighit = (THcSignalHit*) obj;
- #endif
-    sighit->Set(hit->fCounter, hit->fADC_neg);
-    }
-*/
-
-/*
-    if(hit->fTDC_pos >  0) {
-      THcSignalHit *sighit = (THcSignalHit*) fPosTDCHits->ConstructedAt(nPosTDCHits++);
-      sighit->Set(hit->fCounter, hit->fTDC_pos);
-    }
-
-    if(hit->fTDC_neg >  0) {
-      THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nNegTDCHits++);
-      sighit->Set(hit->fCounter, hit->fTDC_neg);
-    }
-
-    if(hit->fADC_pos >  0) {
-      THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++);
-      sighit->Set(hit->fCounter, hit->fADC_pos);
-    }
-
-    if(hit->fADC_neg >  0) {
-      THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
-      sighit->Set(hit->fCounter, hit->fADC_neg);
-    }
-*/
     ihit++;
   }
   return(ihit);