diff -N CalorimeterIDDecoder.java
--- CalorimeterIDDecoder.java	7 Feb 2006 17:02:04 -0000	1.11
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@

-package org.lcsim.geometry;
-
-// FIXME: Lots of stuff uses this in org.lcsim but functionality has been pushed 
-// up to the generic IDDecoder.
-@Deprecated
-public interface CalorimeterIDDecoder extends IDDecoder
-{}

diff -u -r1.5 -r1.6
--- Segmentation.java	7 Feb 2006 17:08:11 -0000	1.5
+++ Segmentation.java	1 Jul 2008 23:52:14 -0000	1.6
@@ -6,12 +6,11 @@

  *
  * @author tonyj
  */

-//extends org.lcsim.geometry.util.BaseIDDecoder

 public class Segmentation

-extends org.lcsim.geometry.util.CalorimeterIDDecoder

+extends org.lcsim.geometry.util.BaseIDDecoder

 {
    protected Segmentation(Element segmentation)
    {
         super();
    }

-}

\ No newline at end of file

+}