diff --git a/pom.xml b/pom.xml
index 1ac04bc9eb3791b03d58cc077adf58171fc62d4a..4ea891df69d5e594248baf599d22d84e5042ed59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,21 +216,6 @@
           <compilerArgument>-Xlint:deprecation</compilerArgument>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>ru.concerteza.buildnumber</groupId>
-        <artifactId>maven-jgit-buildnumber-plugin</artifactId>
-        <version>${rugged.jgit.buildnumber.version}</version>
-        <executions>
-          <execution>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>extract-buildnumber</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -239,7 +224,6 @@
           <archive>
             <manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
             <manifestEntries>
-              <Implementation-Build>${rugged.implementation.build}</Implementation-Build>
               <X-Compile-Source-JDK>${rugged.compiler.source}</X-Compile-Source-JDK>
               <X-Compile-Target-JDK>${rugged.compiler.target}</X-Compile-Target-JDK>
             </manifestEntries>
@@ -414,9 +398,6 @@
           </execution>
         </executions>
       </plugin>
-       
-       
-       
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -565,6 +546,48 @@
   </reporting>
 
   <profiles>
+    <profile>
+      <id>git</id>
+      <activation>
+      <file>
+        <exists>.git</exists>
+      </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>ru.concerteza.buildnumber</groupId>
+            <artifactId>maven-jgit-buildnumber-plugin</artifactId>
+            <version>${rugged.jgit.buildnumber.version}</version>
+            <executions>
+              <execution>
+                <phase>prepare-package</phase>
+                  <goals>
+                   <goal>extract-buildnumber</goal>
+                  </goals>
+              </execution>
+            </executions>
+            <configuration>
+            </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${rugged.maven-jar-plugin.version}</version>
+          <configuration>
+           <archive>
+            <manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
+            <manifestEntries>
+              <Implementation-Build>${rugged.implementation.build}</Implementation-Build>
+              <X-Compile-Source-JDK>${rugged.compiler.source}</X-Compile-Source-JDK>
+              <X-Compile-Target-JDK>${rugged.compiler.target}</X-Compile-Target-JDK>
+            </manifestEntries>
+           </archive>
+          </configuration>
+        </plugin>
+       </plugins>
+      </build>
+    </profile>
     <profile>
       <id>release</id>
       <build>
diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java b/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
index ee039013324cd01b0931eaab8b2bffa0466feb4b..845a1c2dd87b53454080f5dcfd1863d67d59e6d5 100644
--- a/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
+++ b/src/main/java/org/orekit/rugged/adjustment/measurements/Observables.java
@@ -121,7 +121,6 @@ public class Observables {
     public SensorToSensorMapping getInterMapping(final String ruggedNameA, final String sensorNameA,
                                                  final String ruggedNameB, final String sensorNameB) {
 
-        //TODO GP revoir la creation de string par "+"
         final String keyA = ruggedNameA + RUGGED_SENSOR_SEPARATOR + sensorNameA;
         final String keyB = ruggedNameB + RUGGED_SENSOR_SEPARATOR + sensorNameB;
         final SensorToSensorMapping mapping = interMappings.get(keyA + SENSORS_SEPARATOR + keyB);
@@ -134,7 +133,6 @@ public class Observables {
      */
     private String createKey(final SensorToGroundMapping groundMapping)
     {
-        //TODO GP revoir la creation de string par "+"
         final String key = groundMapping.getRuggedName() + RUGGED_SENSOR_SEPARATOR + groundMapping.getSensorName();
         return key;
     }
@@ -145,7 +143,6 @@ public class Observables {
      */
     private String createKey(final SensorToSensorMapping sensorMapping)
     {
-        //TODO GP revoir la creation de string par "+"
         final String keyA = sensorMapping.getRuggedNameA() + RUGGED_SENSOR_SEPARATOR + sensorMapping.getSensorNameA();
         final String keyB = sensorMapping.getRuggedNameB() + RUGGED_SENSOR_SEPARATOR + sensorMapping.getSensorNameB();
         return keyA + SENSORS_SEPARATOR + keyB;