diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 8aa9dfd6d7..04c9f5a57a 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -36,6 +36,14 @@
     distributed = off          # not implemented yet
   </stm>
  
+  <rest>
+    service = on
+    hostname = "localhost"
+    port = 9998
+    filters = "se.scalablesolutions.akka.security.AkkaSecurityFilterFactory"
+    authenticator = "se.scalablesolutions.akka.security.samples.BasicAuthenticationService"
+  </rest>
+  
   <remote>
     <server>
       service = on
@@ -49,14 +57,6 @@
     <client>
   </remote>
  
-  <rest>
-    service = on
-    hostname = "localhost"
-    port = 9998
-    filters = "se.scalablesolutions.akka.security.AkkaSecurityFilterFactory"
-    authenticator = "se.scalablesolutions.akka.security.samples.BasicAuthenticationService"
-  </rest>
-  
   <storage>
     <cassandra>
       hostname = "127.0.0.1"        # IP address or hostname of one of the Cassandra cluster's seeds
diff --git a/config/akka.conf b/config/akka.conf
index cd437972a7..37c8fba25d 100644
--- a/config/akka.conf
+++ b/config/akka.conf
@@ -1,78 +1,4 @@
-#include "akka-reference.conf"
+include "akka-reference.conf"
 
 # This config import the Akka reference configuration. 
 # In this file you can override any option defined in the 'akka-reference.conf' file.
-
-####################
-# Akka Config File #
-####################
- 
-# This file has all the default settings, so all these could be remove with no visible effect.
-# Modify as needed.
- 
-<log>
-  filename = "./logs/akka.log"
-  roll = "daily"  # Options: never, hourly, daily, sunday/monday/...
-  level = "debug" # Options: fatal, critical, error, warning, info, debug, trace
-  console = on
-  # syslog_host = ""
-  # syslog_server_name = ""
-</log>
- 
-<akka>
-  version = "0.6"
- 
-  # FQN to the class doing initial active object/actor
-  # supervisor bootstrap, should be defined in default constructor
-  boot = ["sample.java.Boot", "sample.scala.Boot", "sample.secure.Boot"]
-
-  <actor>
-    timeout = 5000           # default timeout for future based invocations
-    serialize-messages = off # does a deep clone of (non-primitive) messages to ensure immutability
-  </actor>
- 
-  <stm>
-    service = on
-    max-nr-of-retries = 10
-    restart-on-collision = off # (not implemented yet) if 'on' then it reschedules the transaction,
-                               # if 'off' then throws an exception or rollback for user to handle
-    wait-for-completion = 1000 # how long time in millis a transaction should be given time to complete when a collision is detected
-    wait-nr-of-times = 3       # the number of times it should check for completion of a pending transaction upon collision
-    distributed = off          # not implemented yet
-  </stm>
- 
-  <rest>
-    service = true
-    hostname = "localhost"
-    port = 9998
-    filters = "se.scalablesolutions.akka.security.AkkaSecurityFilterFactory"
-    authenticator = "sample.secure.SimpleAuthenticationService"
-  </rest>
-
-  <remote>
-    <server>
-      service = on
-      hostname = "localhost"
-      port = 9999
-      connection-timeout = 1000 # in millis (1 sec default)
-    <server>
-    <client>
-      reconnect-delay = 5000    # in millis (5 sec default)
-      read-timeout = 10000      # in millis (10 sec default)
-    <client>
-  </remote>
-
-  <storage>
-    <cassandra>
-      hostname = "127.0.0.1"        # IP address or hostname of one of the Cassandra cluster's seeds
-      port = 9160
-      storage-format = "scala-json" # Options: java, scala-json, java-json, protobuf
-      consistency-level = 1 
-    </cassandra>
-    <mongodb>
-      hostname = "127.0.0.1"        # IP address or hostname of the MongoDB DB instance
-      port = 27017
-      dbname = "mydb"
-    </mongodb>
-  </storage>
-</akka>
diff --git a/pom.xml b/pom.xml
index 8cde3f843f..0f6b4f61dd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -226,11 +226,11 @@
           <jvmArgs>
             <jvmArg>-Xmx1024m</jvmArg>
           </jvmArgs>
-          <args>
+          <!--args>
             <arg>-unchecked</arg>
             <arg>-deprecation</arg>
             <arg>-Xno-varargs-conversion</arg>
-          </args>
+          </args-->
           <scalaVersion>${scala.version}</scalaVersion>
         </configuration>
       </plugin>
@@ -337,6 +337,7 @@
             <tag>FIXME</tag>
             <tag>TODO</tag>
             <tag>XXX</tag>
+            <tag>@fixme</tag>
             <tag>@todo</tag>
             <tag>@deprecated</tag>
           </tags>
@@ -355,7 +356,7 @@
             <jvmArg>-DpackageLinkDefs=file://${basedir}/../vscaladocs-packageLinkDefs.properties</jvmArg>
           </jvmArgs>
           <args>
-            <arg>-unchecked</arg>
+            <!--arg>-unchecked</arg-->
           </args>
           <vscaladocVersion>1.2-SNAPSHOT</vscaladocVersion>
           <scalaVersion>${scala.version}</scalaVersion>