diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/GlobalTimestamp.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/GlobalTimestamp.scala
deleted file mode 100644
index a9e451f6238323e8b38a1027b0c45772c2ab175b..0000000000000000000000000000000000000000
--- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/GlobalTimestamp.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-/** **********************************************************************************************************
-  * Contributors:
-  * 		- created by Pierre Falez on 10/05/16.
-  * **********************************************************************************************************/
-package fr.univ_lille.cristal.emeraude.n2s3.core
-
-import fr.univ_lille.cristal.emeraude.n2s3.core.GlobalTypesAlias.Timestamp
-import fr.univ_lille.cristal.emeraude.n2s3.support.actors.Message
-
-class GlobalTimestamp {
-  var timestamp: Timestamp = 0
-}
-
-trait TimestampGenerator {
-  var currentMaxTimestamp: Timestamp = 0
-
-  def getGlobalTimestamp: GlobalTimestamp
-
-  def toGlobalTimestamp(rawTimestamp: Timestamp): Timestamp = {
-    currentMaxTimestamp = math.max(rawTimestamp, currentMaxTimestamp)
-    getGlobalTimestamp.timestamp + rawTimestamp
-  }
-
-  def endOfStage(): Unit = {
-    getGlobalTimestamp.timestamp += currentMaxTimestamp
-    currentMaxTimestamp = 0
-  }
-}
\ No newline at end of file
diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/NetworkEntity.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/NetworkEntity.scala
index 35ad6a7969e10e0dd59a2fa2cfa38c7a1d43b45b..d1a3afe58ad84bf5bcc9230d698cb16da517c6b3 100644
--- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/NetworkEntity.scala
+++ b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/NetworkEntity.scala
@@ -28,7 +28,7 @@ object NetworkEntity {
 }
 
 /**
-  * Represent entity which can be designated by a reference
+  * A trait with common behaviour for entities in a N2S3 simulation.
   */
 trait NetworkEntity {