diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/ExceedanceModel.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/ExceedanceModel.java
index 63bf9a35ca5c900148bc3af1809bd3de1a6f5830..dc5d1bc818ff8741a932416f096a585331cf96aa 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/ExceedanceModel.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/ExceedanceModel.java
@@ -139,13 +139,17 @@ public enum ExceedanceModel {
     }
   },
 
-  /*
-   * This is messy for now; need to figure out the best way to pass in fixed
-   * sigmas. The peer models below simply set a value internally as dicated by
-   * the test cases that use these models.
+  /**
+   * Basic Peer test mixture model with fixed sigma of 0.65.
    */
-  @Deprecated
   PEER_MIXTURE_REFERENCE {
+
+    /*
+     * This is messy for now; need to figure out the best way to pass in fixed
+     * sigmas. The peer models below simply set a value internally as dicated by
+     * the test cases that use these models.
+     */
+
     @Override
     double exceedance(double μ, double σ, double n, Imt imt, double value) {
       return boundedCcdFn(μ, 0.65, value, 0.0, 1.0);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
index e95cccebc549266844ce65e4c3d6fec411a77d0b..4e526fde2d0b6b8048f26544335c51ed1da25ddc 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
@@ -328,7 +328,7 @@ public final class HazardExport {
     return Maps.immutableEnumMap(imtMap);
   }
 
-  @Deprecated // get from config
+  // get from config?
   private static final double TRUNCATION_LIMIT = 1e-4;
 
   /**
@@ -389,7 +389,6 @@ public final class HazardExport {
   }
 
   // Consider Stream (above)
-  @Deprecated
   private static Set<Gmm> gmmSet(Iterable<RuptureSet<? extends Source>> ruptureSets) {
     return Sets.immutableEnumSet(
         FluentIterable.from(ruptureSets).transformAndConcat(
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/AbstractGriddedSurface.java b/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/AbstractGriddedSurface.java
index 83eab6530d4a41b8bdfc09234ad1180d28b86c81..8000a46c535996cd93120fac469f22507b05d9dd 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/AbstractGriddedSurface.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/AbstractGriddedSurface.java
@@ -110,7 +110,6 @@ abstract class AbstractGriddedSurface extends Container2DImpl<Location> implemen
   // }
   //
   @Override
-  @Deprecated
   public LocationList getEvenlyDiscritizedPerimeter() {
     throw new UnsupportedOperationException("to be removed");
     // return GriddedSurfaceUtils.getEvenlyDiscritizedPerimeter(this);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/DefaultGriddedSurface.java b/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/DefaultGriddedSurface.java
index 59884ad9938546aa92e39d44b76ab3d66f2c5640..6dcbdc78099c976dab5f50a7beb972c604326dd5 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/DefaultGriddedSurface.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/DefaultGriddedSurface.java
@@ -410,7 +410,7 @@ public class DefaultGriddedSurface extends AbstractGriddedSurface {
 
   // Surely the creation of a gridded surface can be easier...
   // createEvenlyGriddedSurface()
-  @Deprecated // until proven useful or better
+  // until proven useful or better
   public void create(LocationList trace, double dip, double width, double spacing) {
     double dipRad = dip * Maths.TO_RADIANS;
     double dipDirRad = Faults.dipDirectionRad(trace);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/GriddedSurface.java b/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/GriddedSurface.java
index 308ae88d2f7a1b7cc86801c9ee4efddfd3d6d108..36a36c43202c551af5b539bc98611021bb245558 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/GriddedSurface.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/fault/surface/GriddedSurface.java
@@ -51,7 +51,6 @@ public interface GriddedSurface extends Container2D<Location>, RuptureSurface {
    * the implementing class. These locations should be ordered starting along
    * the top and moving along following the Aki and Richards convention.
    */
-  @Deprecated
   public LocationList getEvenlyDiscritizedPerimeter();
 
   /**
@@ -86,14 +85,12 @@ public interface GriddedSurface extends Container2D<Location>, RuptureSurface {
   /**
    * This returns the first location on the upper edge of the surface
    */
-  @Deprecated
   // getUpperEdgeLocationList().last()
   public Location getFirstLocOnUpperEdge();
 
   /**
    * This returns the last location on the upper edge of the surface
    */
-  @Deprecated
   // getUpperEdgeLocationList().last()
   public Location getLastLocOnUpperEdge();
 
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java
index 4e19652e9d626afb7c19ad3152cc5a98a237d6b3..999c68161b444d84502752005894b162d225a288 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java
@@ -390,20 +390,4 @@ public class AbrahamsonEtAl_2014 implements GroundMotionModel {
       return true;
     }
   }
-
-  /*
-   * Custom flavor to (temporarily) support the fact that additional epistemic
-   * uncertainty in the WUS was never propagated through cluster sources.
-   */
-  @Deprecated
-  static class BasinNoEpi extends AbrahamsonEtAl_2014 {
-    BasinNoEpi(Imt imt) {
-      super(imt);
-    }
-
-    @Override
-    boolean deepBasinEffect() {
-      return true;
-    }
-  }
 }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java
index 235596457f6a4a4651ee53656b9acde61397783d..b5bdaa2bf3f7309dd1e67887b9941c4bd232fd20 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java
@@ -296,20 +296,4 @@ public class BooreEtAl_2014 implements GroundMotionModel {
       return true;
     }
   }
-
-  /*
-   * Custom flavor to (temporarily) support the fact that additional epistemic
-   * uncertainty in the WUS was never propagated through cluster sources.
-   */
-  @Deprecated
-  static class BasinNoEpi extends BooreEtAl_2014 {
-    BasinNoEpi(Imt imt) {
-      super(imt);
-    }
-
-    @Override
-    boolean deepBasinEffect() {
-      return true;
-    }
-  }
 }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java
index cde4a20273c257e4d4aee8e5ff22df3dcaf0d438..b82496f96d6816b0ac17eefaf404224894f66ac0 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java
@@ -433,21 +433,4 @@ public class CampbellBozorgnia_2014 implements GroundMotionModel {
       return true;
     }
   }
-
-  /*
-   * Custom flavor to (temporarily) support the fact that additional epistemic
-   * uncertainty in the WUS was never propagated through cluster sources.
-   */
-  @Deprecated
-  static class BasinNoEpi extends CampbellBozorgnia_2014 {
-    BasinNoEpi(Imt imt) {
-      super(imt);
-    }
-
-    @Override
-    boolean deepBasinEffect() {
-      return true;
-    }
-  }
-
 }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java
index c54b6a35519497a8c01e69d2f631c327bf8a28a4..4122c35be6ae87fe0d3a27eccd3db8bd04dd5b56 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java
@@ -314,20 +314,4 @@ public class ChiouYoungs_2014 implements GroundMotionModel {
       return true;
     }
   }
-
-  /*
-   * Custom flavor to (temporarily) support the fact that additional epistemic
-   * uncertainty in the WUS was never propagated through cluster sources.
-   */
-  @Deprecated
-  static class BasinNoEpi extends ChiouYoungs_2014 {
-    BasinNoEpi(Imt imt) {
-      super(imt);
-    }
-
-    @Override
-    boolean deepBasinEffect() {
-      return true;
-    }
-  }
 }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/internal/Parsing.java b/src/main/java/gov/usgs/earthquake/nshmp/internal/Parsing.java
index 19d9569df042a5a299fdd3d7e42a1af03576cfbc..93fe85b95d42f54618b9dcd900eb16f44ccfd7d9 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/internal/Parsing.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/internal/Parsing.java
@@ -12,7 +12,6 @@ import java.io.InputStream;
 import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.BitSet;
 import java.util.Collection;
 import java.util.EnumMap;
 import java.util.Iterator;
@@ -696,33 +695,4 @@ public final class Parsing {
     return list;
   }
 
-  /**
-   * This method is currently unused and slated for removal.
-   *
-   * @param in
-   * @param bitSetSize
-   * @throws IOException
-   */
-  @Deprecated
-  public static List<BitSet> readBinaryIntBitSets(InputStream in, int bitSetSize)
-      throws IOException {
-    if (!(checkNotNull(in) instanceof BufferedInputStream)) {
-      in = new BufferedInputStream(in);
-    }
-    DataInputStream din = new DataInputStream(in);
-    int count = din.readInt();
-    checkState(count > 0, "Number of lists must be > 0");
-    List<BitSet> list = Lists.newArrayList();
-    for (int i = 0; i < count; i++) {
-      int size = din.readInt();
-      BitSet bits = new BitSet(bitSetSize);
-      for (int j = 0; j < size; j++) {
-        bits.set(din.readInt());
-      }
-      list.add(bits);
-    }
-    in.close();
-    return list;
-  }
-
 }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/ClusterRuptureSet.java b/src/main/java/gov/usgs/earthquake/nshmp/model/ClusterRuptureSet.java
index 778b86e4e085b9076d3309fdab270301746caff1..93ed20ab76747156d0114024f61bed549f248a10 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/model/ClusterRuptureSet.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/model/ClusterRuptureSet.java
@@ -54,7 +54,8 @@ public class ClusterRuptureSet extends AbstractRuptureSet<ClusterSource> {
   }
 
   @Override
-  @Deprecated // this is problemtic as we are not getting the rate weight
+  // this is problemtic as we are not getting the rate weight
+  // is this still a problem?
   public Iterator<ClusterSource> iterator() {
     return source.iterator();
   }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/Distance.java b/src/main/java/gov/usgs/earthquake/nshmp/model/Distance.java
index 8e85bb709db74afe4d0e9c09a30a68c5b532c30e..22b0b140ac83f3d0698bc4316e529759afe5c710 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/model/Distance.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/model/Distance.java
@@ -31,8 +31,7 @@ public final class Distance {
    * the maximum known to be supported by across all implementated ground motion
    * models.
    */
-  @Deprecated
-  public static final double MAX = 1000.0; // should we poll GMMs
+  public static final double MAX = 1000.0; // should poll GMMs
 
   public enum Type {
     R_JB,
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/GmmSet.java b/src/main/java/gov/usgs/earthquake/nshmp/model/GmmSet.java
index c485d6c6fb0b8b599ff232572a5158157bf5ae31..e168b7b4a26b209cd024a61e6204799206237731 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/model/GmmSet.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/model/GmmSet.java
@@ -179,7 +179,6 @@ public final class GmmSet {
       return this;
     }
 
-    @Deprecated
     Builder secondaryMaxDistance(double maxDistance) {
       maxDistanceHi = checkInRange(MAX_DIST_RANGE, "Max distance", maxDistance);
       return this;
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/Rupture.java b/src/main/java/gov/usgs/earthquake/nshmp/model/Rupture.java
index 52925f66a565b4d14f553d40ff43c95b56f0859b..36155c266ef4f5cf904052aea25bb2709ca15c30 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/model/Rupture.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/model/Rupture.java
@@ -45,22 +45,6 @@ public class Rupture {
     return new Rupture(mag, rate, rake, surface, null);
   }
 
-  /**
-   * Creates a new {@code Rupture}.
-   *
-   * @param mag moment magnitude
-   * @param rate of occurrence (annual)
-   * @param rake slip direction on rupture surface
-   * @param surface of the rupture
-   * @param hypocenter of the rupture
-   * @return a new {@code Rupture}
-   */
-  @Deprecated // until proven useful
-  static Rupture create(double mag, double rate, double rake, RuptureSurface surface,
-      Location hypocenter) {
-    return new Rupture(mag, rate, rake, surface, hypocenter);
-  }
-
   /**
    * The {@code Rupture} magnitude.
    */
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/Source.java b/src/main/java/gov/usgs/earthquake/nshmp/model/Source.java
index 10780191b2842701a6515bbcb42df078791af9ba..071f0eb8ce6210ac78b14526dfb8cfaeed819ff2 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/model/Source.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/model/Source.java
@@ -44,7 +44,6 @@ public interface Source extends Iterable<Rupture> {
   /**
    * The MFDs that define earthquake rates for this source.
    */
-  @Deprecated
-  List<Mfd> mfds();
+  List<Mfd> mfds(); // this may not really be needed
 
 }