diff --git a/jepl/jepl.py b/jepl/jepl.py
index cdd4aad..4862a55 100644
--- a/jepl/jepl.py
+++ b/jepl/jepl.py
@@ -8,11 +8,10 @@ import sys
 from .jepl_general import *
 from .jeplpv import  *
 from .jepl_circuits import *
-from .jepl_templates import *
-from .jepl_safety import *
-
-
-#print(cec21table1)
+# safety still needs to be re-wrote, but I will do it later.
+#from .jepl_safety import * 
+# Templates rely on safety so I will have to fix it too
+#from .jepl_templates import *
 
 def Test():
     print( "JMK Python Module works! !")
diff --git a/jepl/jepl_circuits.py b/jepl/jepl_circuits.py
index 9d3f8d0..c066718 100644
--- a/jepl/jepl_circuits.py
+++ b/jepl/jepl_circuits.py
@@ -375,7 +375,6 @@ def conduit_size(num_cc,cc_con,bond,insulation="RW90", voltage = 1000, jacketed
     #
     # Determine the maximum conduit fill
     #
-    import numpy as np
 
     if num_cc == 1:
         percent_fill = 0.53
@@ -452,9 +451,6 @@ def conduit_size(num_cc,cc_con,bond,insulation="RW90", voltage = 1000, jacketed
     return result_raw,result_name,result_inner_dia,resulting_percent_fill
     
 
-
-    
-
 def cable_schedule_naming(conductor_size,conductors,runs = 1,bond='BOND'):
 
     '''