diff --git a/setup.py b/setup.py
index b37ef1fe2..c4ec9dd79 100755
--- a/setup.py
+++ b/setup.py
@@ -48,21 +48,8 @@
 p = subprocess.Popen(["python", "setup_default_args.py"], cwd="share")
 p.communicate()
 
-portrait_files = [
-    "pcmdi_metrics/graphics/share/portraits.scr",
-]
+packages = find_packages(exclude=['cmec', 'tests'])
 
-packages = {
-    "pcmdi_metrics": "src/python",
-    "pcmdi_metrics.io": "src/python/io",
-    "pcmdi_metrics.pcmdi": "src/python/pcmdi",
-    "pcmdi_metrics.diurnal": "src/python/diurnal",
-    "pcmdi_metrics.graphics": "src/python/graphics",
-    "pcmdi_metrics.driver": "src/python/pcmdi/scripts/driver",
-    "pcmdi_metrics.monsoon_wang": "src/python/monsoon_wang/lib",
-    "pcmdi_metrics.monsoon_sperber": "src/python/monsoon_sperber/lib",
-}
-packages = find_packages()
 scripts = [
     "pcmdi_metrics/pcmdi/scripts/mean_climate_driver.py",
     "pcmdi_metrics/pcmdi/scripts/pcmdi_compute_climatologies.py",
@@ -76,7 +63,6 @@
     "pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py",
     "pcmdi_metrics/precip_distribution/precip_distribution_driver.py",
 ]
-# scripts += glob.glob("pcmdi_metrics/diurnal/scripts/*.py")
 
 entry_points = {
     "console_scripts": [
@@ -91,15 +77,10 @@
     ],
 }
 
-demo_files = glob.glob("demo/*/*")
-print("demo files")
-
 data_files = (
-    ("share/pmp/graphics/vcs", portrait_files),
     (
         "share/pmp/graphics/png",
         [
-            "share/pcmdi/171101_doutriaux1_UVCDATLogo_446x119px_72dpi.png",
             "share/pcmdi/CDATLogo_140x49px_72dpi.png",
             "share/pcmdi/CDATLogo_1866x651px_300dpi.png",
             "share/pcmdi/CDATLogo_200x70px_72dpi.png",
@@ -111,8 +92,6 @@
             "share/pcmdi/PCMDILogo_400x131px_72dpi.png",
             "share/pcmdi/PCMDILogo_500x164px_72dpi.png",
             "share/pcmdi/PCMDILogoText_1365x520px_300dpi.png",
-            "share/pcmdi/PCMDILogo-old-oblong_377x300px_72dpi.png",
-            "share/pcmdi/PCMDILogo-old_348x300px_72dpi.png",
             "share/pcmdi/PMPLogoText_1359x1146px_300dpi.png",
             "share/pcmdi/PMPLogo_1359x1146px_300dpi.png",
             "share/pcmdi/PMPLogo_500x421px_72dpi.png",
@@ -131,7 +110,6 @@
             "pcmdi_metrics/precip_distribution/lib/cluster3_pdf.amt_regrid.360x180_IMERG_ALL.nc",
         ),
     ),
-    ("share/pmp/demo", demo_files),
 )
 
 if install_dev: