diff --git a/core/pom.xml b/core/pom.xml
index 967e18d3df..3a998c9c86 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -14,44 +14,6 @@
     <build>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <!-- broken with Java 8 (MSHADE-174), using ProGuard instead. -->
-                    <minimizeJar>false</minimizeJar>
-                    <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>io.bitsquare.app.BitsquareAppMain</mainClass>
-                        </transformer>
-                    </transformers>
-                    <filters>
-                        <filter>
-                            <!-- exclude signatures, the bundling process breaks them for some reason -->
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>bundled</shadedClassifierName>
-                            <finalName>shaded</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
 
             <!-- <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
index a18f217f68..4ccf9c10bf 100644
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
@@ -97,8 +97,7 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
                                              else {
                                                  log.info("sendMessage failed. We will try to send the message to the mailbox. Fault reason:  " +
                                                          futureDirect.failedReason());
-                                                 if (pubKeyRing != null)
-                                                     sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
+                                                 sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
                                              }
                                          }
 
@@ -106,8 +105,7 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
                                          public void exceptionCaught(Throwable t) throws Exception {
                                              log.info("sendMessage failed with exception. We will try to send the message to the mailbox. Exception: "
                                                      + t.getMessage());
-                                             if (pubKeyRing != null)
-                                                 sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
+                                             sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
                                          }
                                      }
             );
@@ -119,7 +117,6 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
         }
     }
 
-
     private void sendMailboxMessage(PubKeyRing pubKeyRing, SealedAndSignedMessage message, SendMessageListener listener) {
         log.info("sendMailboxMessage called");
         mailboxService.addMessage(
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
index c6a259bb01..ae5fc7d086 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
@@ -158,7 +158,7 @@ public class BitsquareApp extends Application {
             primaryStage.show();
 
             //TODO just temp.
-            showDebugWindow();
+            //showDebugWindow();
         } catch (Throwable throwable) {
             showErrorPopup(throwable, true);
         }