diff --git a/setup.py b/setup.py
index 90df264..539c823 100755
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,11 @@
 
 from setuptools import setup, find_packages
 import subprocess
+import shutil
+import os
+
+if os.path.isdir('build'):
+    shutil.rmtree('build')
 
 setup(name="singer-python",
       version='5.12.1',
@@ -14,8 +19,7 @@
           'jsonschema==2.6.0',
           'simplejson==3.11.1',
           'python-dateutil>=2.6.0',
-          'backoff==1.8.0',
-	  'ciso8601',
+          'backoff==1.8.0'
       ],
       extras_require={
           'dev': [
@@ -33,3 +37,8 @@
               ]
           },
 )
+
+# clean-up
+if os.path.isdir('build'):
+    shutil.rmtree('build')
+shutil.rmtree('singer_python.egg-info')
\ No newline at end of file
diff --git a/singer/messages.py b/singer/messages.py
index 3848801..c5aaf68 100644
--- a/singer/messages.py
+++ b/singer/messages.py
@@ -2,7 +2,8 @@
 
 import pytz
 import simplejson as json
-import ciso8601
+#Remove this one because it is not native Python lib so it makes deployment complicated.
+#import ciso8601
 
 import singer.utils as u
 from .logger import get_logger
@@ -187,12 +188,14 @@ def parse_message(msg):
 
     if msg_type == 'RECORD':
         time_extracted = obj.get('time_extracted')
-        if time_extracted:
-            try:
-                time_extracted = ciso8601.parse_datetime(time_extracted)
-            except:
-                LOGGER.warning("unable to parse time_extracted with ciso8601 library")
-                time_extracted = None
+        # ciso8601 is not python library. this makes complicated deployment on AWS Glue
+        # comment out this part
+        # if time_extracted:
+        #     try:
+        #         time_extracted = ciso8601.parse_datetime(time_extracted)
+        #     except:
+        #         LOGGER.warning("unable to parse time_extracted with ciso8601 library")
+        #         time_extracted = None
 
 
             # time_extracted = dateutil.parser.parse(time_extracted)