diff --git a/.travis.yml b/.travis.yml
index d617a7b02..76c76c587 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ jdk:
   - oraclejdk7  
   - oraclejdk8
 
-install: mvn clean verify site
+install: mvn clean verify site -Dlinkcheck.skip=true
 
 after_success:
   - mvn -Ptravis surefire-report:report jacoco:report coveralls:jacoco
diff --git a/pom.xml b/pom.xml
index 6712478b1..9874b170a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -494,7 +494,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>2.6</version>
         <configuration>
           <instrumentation>
             <excludes>
@@ -538,98 +538,11 @@
           <downloadJavadocs>true</downloadJavadocs>
         </configuration>
       </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.1</version>
-        <configuration>
-          <source>1.7</source>
-          <failOnError>false</failOnError>
-          <linksource>true</linksource>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <id>default</id>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
-      <plugin>
-        <groupId>com.github.sevntu-checkstyle</groupId>
-        <artifactId>dsm-maven-plugin</artifactId>
-        <version>2.1.3</version>
-        <configuration>
-          <obfuscatePackageNames>true</obfuscatePackageNames>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-linkcheck-plugin</artifactId>
-        <version>1.2</version>
-        <configuration>
-          <excludedPages>
-            <excludedPage>dependencies.html</excludedPage>
-          </excludedPages>
-          <excludedLinks>
-            <excludedLink>reports/google-style/guava</excludedLink>
-            <excludedLink>reports/javadoc/openjdk8</excludedLink>
-            <excludedLink>https://travis-ci.org/checkstyle/checkstyle</excludedLink>
-            <excludedLink>https://coveralls.io/r/checkstyle/checkstyle</excludedLink>
-            <excludedLink>http://search.maven.org/*</excludedLink>
-            <excludedLink>hhttp://junit.org</excludedLink>
-          </excludedLinks>
-          <excludedHttpStatusErrors>
-            <excludedHttpStatusError>401</excludedHttpStatusError>
-          </excludedHttpStatusErrors>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </reporting>
-
-  <profiles>
-    <profile>
-      <!-- To be used when making distributions. Run the command-->
-      <!-- mvn -Pdistro package -->
-      <id>distro</id>
-
-      <build>
-        <plugins>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>verify_checkstyle</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>checkstyle</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <configLocation>checkstyle_checks.xml</configLocation>
-              <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-              <suppressionsLocation>suppressions.xml</suppressionsLocation>
-              <headerLocation>java.header</headerLocation>
-              <propertyExpansion>checkstyle.importcontrol.file=import-control.xml</propertyExpansion>
-              <enableFilesSummary>false</enableFilesSummary>
-            </configuration>
-          </plugin>
 
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>cobertura-maven-plugin</artifactId>
+	    <version>2.6</version>
             <executions>
               <execution>
                 <id>verify_cobertura</id>
@@ -698,74 +611,62 @@
               </execution>
             </executions>
           </plugin>
+      
+      </plugins>
+  </build>
 
-          <!-- Creates the all inclusive uber jar -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>1.4</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <shadedArtifactAttached>true</shadedArtifactAttached>
-                  <shadedClassifierName>all</shadedClassifierName>
-                  <transformers>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                      <mainClass>com.puppycrawl.tools.checkstyle.Main</mainClass>
-                    </transformer>
-                  </transformers>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.1</version>
+        <configuration>
+          <source>1.7</source>
+          <failOnError>false</failOnError>
+          <linksource>true</linksource>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <id>default</id>
+            <reports>
+              <report>javadoc</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
 
-          <!-- Creates the binary and source distributions -->
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2.1</version>
-            <configuration>
-              <descriptors>
-                <descriptor>config/assembly-bin.xml</descriptor>
-                <descriptor>config/assembly-src.xml</descriptor>
-              </descriptors>
-              <tarLongFileMode>gnu</tarLongFileMode>
-            </configuration>
-            <executions>
-              <execution>
-                <id>make-bundle</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <plugin>
+        <groupId>com.github.sevntu-checkstyle</groupId>
+        <artifactId>dsm-maven-plugin</artifactId>
+        <version>2.1.3</version>
+        <configuration>
+          <obfuscatePackageNames>true</obfuscatePackageNames>
+        </configuration>
+      </plugin>
 
-      <!-- Reports -->
-      <reporting>
-        <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-linkcheck-plugin</artifactId>
+        <version>1.2</version>
+        <configuration>
+          <excludedPages>
+            <excludedPage>dependencies.html</excludedPage>
+          </excludedPages>
+          <excludedLinks>
+            <excludedLink>reports/google-style/guava</excludedLink>
+            <excludedLink>reports/javadoc/openjdk8</excludedLink>
+            <excludedLink>https://travis-ci.org/checkstyle/checkstyle</excludedLink>
+            <excludedLink>https://coveralls.io/r/checkstyle/checkstyle</excludedLink>
+            <excludedLink>http://search.maven.org/*</excludedLink>
+            <excludedLink>hhttp://junit.org</excludedLink>
+          </excludedLinks>
+          <excludedHttpStatusErrors>
+            <excludedHttpStatusError>401</excludedHttpStatusError>
+          </excludedHttpStatusErrors>
+        </configuration>
+      </plugin>
 
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <configuration>
-              <configLocation>${project.build.directory}/../checkstyle_checks.xml</configLocation>
-              <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-              <suppressionsLocation>suppressions.xml</suppressionsLocation>
-              <headerLocation>java.header</headerLocation>
-              <!-- this does not work
-              <propertyExpansion>translation.severity=ignore</propertyExpansion>
-              -->
-              <propertyExpansion>checkstyle.importcontrol.file=import-control.xml</propertyExpansion>
-
-            </configuration>
-          </plugin>
 
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -824,10 +725,10 @@
             <version>2.4</version>
           </plugin>
 
-        </plugins>
+    </plugins>
+  </reporting>
 
-      </reporting>
-    </profile>
+  <profiles>
 
     <profile>
       <id>release</id>