diff --git a/source/physics/ELLookupTable.cc b/source/physics/ELLookupTable.cc
index 3651350185..6a1ffd8daf 100644
--- a/source/physics/ELLookupTable.cc
+++ b/source/physics/ELLookupTable.cc
@@ -3,6 +3,10 @@
 //
 // This class describes the generation of the EL light.
 //
+// ****************************** WARNING *******************************
+// ******************* This class has been deprecated *******************
+// **********************************************************************
+//
 // The NEXT Collaboration
 // ----------------------------------------------------------------------------
 
diff --git a/source/physics/ELLookupTable.h b/source/physics/ELLookupTable.h
index 3fe0cd9014..b20f53f8d9 100644
--- a/source/physics/ELLookupTable.h
+++ b/source/physics/ELLookupTable.h
@@ -3,6 +3,10 @@
 //
 // This class describes the generation of the EL light.
 //
+// ****************************** WARNING *******************************
+// ******************* This class has been deprecated *******************
+// **********************************************************************
+//
 // The NEXT Collaboration
 // ----------------------------------------------------------------------------
 
diff --git a/source/physics/RadiusDependentDriftField.cc b/source/physics/RadiusDependentDriftField.cc
index 42d4f01608..e309ef1291 100644
--- a/source/physics/RadiusDependentDriftField.cc
+++ b/source/physics/RadiusDependentDriftField.cc
@@ -3,6 +3,10 @@
 //
 // Drift field varying with radial coordinate.
 //
+// ****************************** WARNING *******************************
+// ***************** This class has not been implemented ****************
+// **********************************************************************
+//
 // The NEXT Collaboration
 // ----------------------------------------------------------------------------
 
diff --git a/source/physics/RadiusDependentDriftField.h b/source/physics/RadiusDependentDriftField.h
index f6e7fae590..8414c0420b 100644
--- a/source/physics/RadiusDependentDriftField.h
+++ b/source/physics/RadiusDependentDriftField.h
@@ -3,6 +3,10 @@
 //
 // Drift field varying with radial coordinate.
 //
+// ****************************** WARNING *******************************
+// ***************** This class has not been implemented ****************
+// **********************************************************************
+//
 // The NEXT Collaboration
 // ----------------------------------------------------------------------------
 
diff --git a/source/physics/WavelengthShifting.cc b/source/physics/WavelengthShifting.cc
index 99a067216a..8bd1be3f06 100644
--- a/source/physics/WavelengthShifting.cc
+++ b/source/physics/WavelengthShifting.cc
@@ -6,6 +6,10 @@
 // from a wls_absorption length property but through a probability property,
 // thus independent from the material thickness.
 //
+// ****************************** WARNING *******************************
+// ******************* This class has been deprecated *******************
+// **********************************************************************
+//
 // The NEXT Collaboration
 // ----------------------------------------------------------------------------
 
diff --git a/source/physics/WavelengthShifting.h b/source/physics/WavelengthShifting.h
index eafb25ad4f..876ea5d0af 100644
--- a/source/physics/WavelengthShifting.h
+++ b/source/physics/WavelengthShifting.h
@@ -6,6 +6,10 @@
 // from a wls_absorption length property but through a probability property,
 // thus independent from the material thickness.
 //
+// ****************************** WARNING *******************************
+// ******************* This class has been deprecated *******************
+// **********************************************************************
+//
 // The NEXT Collaboration
 // ----------------------------------------------------------------------------
 
diff --git a/source/physics_lists/NexusPhysics.cc b/source/physics_lists/NexusPhysics.cc
index 6fe28f9926..eb92e13ce6 100644
--- a/source/physics_lists/NexusPhysics.cc
+++ b/source/physics_lists/NexusPhysics.cc
@@ -12,7 +12,6 @@
 #include "IonizationClustering.h"
 #include "IonizationDrift.h"
 #include "Electroluminescence.h"
-#include "WavelengthShifting.h"
 #include "OpPhotoelectricEffect.h"
 
 #include <G4GenericMessenger.hh>
@@ -75,15 +74,6 @@ namespace nexus {
   {
     G4ProcessManager* pmanager = 0;
 
-    // Add our own wavelength shifting process for the optical photon
-    pmanager = G4OpticalPhoton::Definition()->GetProcessManager();
-    if (!pmanager) {
-      G4Exception("[NexusPhysics]", "ConstructProcess()", FatalException,
-        "G4OpticalPhoton without a process manager.");
-    }
-    WavelengthShifting* wls = new WavelengthShifting();
-    pmanager->AddDiscreteProcess(wls);
-
     pmanager = IonizationElectron::Definition()->GetProcessManager();
     if (!pmanager) {
       G4Exception("[NexusPhysics]", "ConstructProcess()", FatalException,