diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index b46a2aa6c..aa92ff21a 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -1171,6 +1171,10 @@ class Fit(object):
         if force_recalc is False:
             return self.__remoteReps
 
+        # We are rerunning the recalcs. Explicitly set to 0 to make sure we don't duplicate anything and correctly set all values to 0.
+        for remote_type in self.__remoteReps:
+            self.__remoteReps[remote_type] = 0
+
         for module in self.modules:
             # Skip empty and non-Active modules
             if module.isEmpty or module.state < State.ACTIVE:
@@ -1213,9 +1217,6 @@ class Fit(object):
             else:
                 hp = 0
 
-            if self.__remoteReps[remote_type] is None:
-                self.__remoteReps[remote_type] = 0
-
             self.__remoteReps[remote_type] += (hp * fueledMultiplier) / duration
 
         return self.__remoteReps
diff --git a/service/crest.py b/service/crest.py
index 8ef51ac3a..27f5b6c5e 100644
--- a/service/crest.py
+++ b/service/crest.py
@@ -1,7 +1,6 @@
 # noinspection PyPackageRequirements
 import wx
 from logbook import Logger
-import logging
 import threading
 import copy
 import uuid