diff --git a/OscCommentMacroListener.py b/OscCommentMacroListener.py
index 9baa558..6e2a815 100644
--- a/OscCommentMacroListener.py
+++ b/OscCommentMacroListener.py
@@ -15,12 +15,9 @@ __email__ = "kevin@company235.com"
 __status__ = "Prototype"
 
 
-import antlr4
 from CommentMacroParser import CommentMacroParser
 from CommentMacroListener import CommentMacroListener
-from OscMacroDefinitions import *
-from pythonosc import osc_message_builder
-from pythonosc import udp_client
+from OscMacroDefinitions import HogDevice
 
 
 def num(string):
diff --git a/OscMacroDefinitions.py b/OscMacroDefinitions.py
index a5cca54..6fab9e3 100644
--- a/OscMacroDefinitions.py
+++ b/OscMacroDefinitions.py
@@ -15,6 +15,7 @@ __email__ = "kevin@company235.com"
 __status__ = "Prototype"
 
 
+from pythonosc import udp_client
 from time import sleep