diff --git a/.gitignore b/.gitignore
index 92a300cb..8c658c72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ brping/definitions.py
 brping/device.py
 brping/ping1d.py
 brping/ping360.py
-brping/s500.py
 brping/surveyor240.py
 brping/omniscan450.py
 doc/xml
diff --git a/brping/__init__.py b/brping/__init__.py
index 88804040..e0b92b7c 100644
--- a/brping/__init__.py
+++ b/brping/__init__.py
@@ -5,5 +5,4 @@
 from brping.ping1d import Ping1D
 from brping.ping360 import Ping360
 from brping.surveyor240 import Surveyor240
-from brping.s500 import S500
 from brping.omniscan450 import Omniscan450
\ No newline at end of file
diff --git a/brping/pingmessage.py b/brping/pingmessage.py
index ce701c0d..c650f885 100644
--- a/brping/pingmessage.py
+++ b/brping/pingmessage.py
@@ -12,8 +12,6 @@
     definitions.PING360_DEVICE_DATA,
     definitions.PING360_AUTO_DEVICE_DATA,
     definitions.SURVEYOR240_ATOF_POINT_DATA,
-    definitions.SURVEYOR240_YZ_POINT_DATA,
-    definitions.S500_PROFILE6_T,
     definitions.OMNISCAN450_OS_MONO_PROFILE
 ]
 
@@ -284,7 +282,7 @@ def __repr__(self):
 
 # A class to digest a serial stream and decode PingMessages
 class PingParser(object):
-    # pre-declare instance variables for faster access and reduced memory overhead 
+    # pre-declare instance variables for faster access and reduced memory overhead
     __slots__ = (
         "buf",
         "state",
diff --git a/ci/deploy-whitelist b/ci/deploy-whitelist
index 67495669..1e8100ee 100644
--- a/ci/deploy-whitelist
+++ b/ci/deploy-whitelist
@@ -4,7 +4,6 @@ brping/device.py
 brping/ping1d.py
 brping/ping360.py
 brping/surveyor240.py
-brping/s500.py
 brping/omniscan450.py
 brping/pingmessage.py
 examples
diff --git a/generate/generate-python.py b/generate/generate-python.py
index a5eacdc2..fa8f9ba5 100755
--- a/generate/generate-python.py
+++ b/generate/generate-python.py
@@ -30,7 +30,6 @@
                 "ping1d",
                 "ping360",
                 "surveyor240",
-                "s500",
                 "omniscan450"]
 
 struct_token = {"u8": "B",
@@ -96,12 +95,6 @@
 f.write(g.generate(definitionFile, templateFile, {"structToken": struct_token}))
 f.close()
 
-definitionFile = "%s/s500.json" % definitionPath
-templateFile = "%s/s500.py.in" % templatePath
-f = open("%s/s500.py" % args.output_directory, "w")
-f.write(g.generate(definitionFile, templateFile, {"structToken": struct_token}))
-f.close()
-
 definitionFile = "%s/omniscan450.json" % definitionPath
 templateFile = "%s/omniscan450.py.in" % templatePath
 f = open("%s/omniscan450.py" % args.output_directory, "w")
diff --git a/setup.py b/setup.py
index dd5ef2f4..89920dac 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,6 @@
       ],
       scripts=[
           "examples/simplePingExample.py",
-          "examples/s500Example.py",
           "examples/omniscan450Example.py",
           "examples/surveyor240Example.py",
           "tools/pingproxy.py",