diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e935f1fdda258b6de554f986f38dcc51da42e02..8653c8c75a9018057ecb47dcfb03c8913e677a87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 # Set up the project.
 cmake_minimum_required( VERSION 3.1 )
-project( "GeoModelCore" VERSION 3.1.3 LANGUAGES CXX )
+project( "GeoModelCore" VERSION 3.1.2 LANGUAGES CXX )
 
 # Set default build options.
 set( CMAKE_BUILD_TYPE "Release" CACHE STRING "CMake build mode to use" )
diff --git a/GeoModelKernel/GeoModelKernel/GeoShapeAction.h b/GeoModelKernel/GeoModelKernel/GeoShapeAction.h
index d4a6226dba62955d2acac74cae6d60c091974939..1258b066941d384ceb6e1b2ceb680610f78816dd 100755
--- a/GeoModelKernel/GeoModelKernel/GeoShapeAction.h
+++ b/GeoModelKernel/GeoModelKernel/GeoShapeAction.h
@@ -36,11 +36,10 @@ class GeoTorus;
 class GeoUnidentifiedShape;
 class GeoSimplePolygonBrep;
 class GeoTessellatedSolid;
-class GeoGenericTrap;
 
-class LArCustomShape; // TODO: This is ATLAS-specific and should be removed at some point, but it is needed in Athena
+class GeoGenericTrap;
 
-class GeoShapeAction
+class GeoShapeAction 
 {
  public:
   GeoShapeAction();
@@ -112,9 +111,7 @@ class GeoShapeAction
   virtual void handleGenericTrap (const GeoGenericTrap *);
   virtual void handleUnidentifiedShape(const GeoUnidentifiedShape *shape);
 
-  virtual void handleLArCustom (const LArCustomShape *); // TODO: This is ATLAS-specific and should be removed at some point, but it is needed in Athena
-
-
+  
  private:
   GeoShapeAction(const GeoShapeAction &right);
   GeoShapeAction & operator=(const GeoShapeAction &right);
@@ -122,7 +119,7 @@ class GeoShapeAction
   //	A limit may be placed upon the depth to which the action
   //	descends.  0 = self.  1 = self and children.
   Query<unsigned int> m_depth;
-
+  
   //	Termination flag; causes an abortion of action execution.
   bool m_terminate;
   GeoShapePath m_path;
diff --git a/GeoModelKernel/src/GeoShapeAction.cxx b/GeoModelKernel/src/GeoShapeAction.cxx
index 19cc89e2fc4fc59a4cc91e816d84b78a9dd80b1f..af4ea971655d2a676e076646c1a579c4ac81448a 100755
--- a/GeoModelKernel/src/GeoShapeAction.cxx
+++ b/GeoModelKernel/src/GeoShapeAction.cxx
@@ -163,8 +163,4 @@ void GeoShapeAction::handleUnidentifiedShape (const GeoUnidentifiedShape * uShap
   handleShape(uShape);
 }
 
-// TODO: This is ATLAS-specific and should be removed at some point, but it is needed in Athena
-void GeoShapeAction::handleLArCustom (const LArCustomShape *lar)
-{
-  handleShape( (GeoShape *) lar);
-}
+