diff --git a/pyrightconfig.json b/pyrightconfig.json
index 622b586c7..83d754045 100644
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@@ -5,9 +5,20 @@
         "stubs"
     ],
     "exclude": [
+        // Python 2 only modules.
         "**/@python2",
-        "stdlib/__main__.pyi",
-        "stdlib/encodings",
+        "stubs/enum34",
+        "stubs/fb303",
+        "stubs/futures",
+        "stubs/ipaddress",
+        "stubs/kazoo",
+        "stubs/openssl-python",
+        "stubs/pathlib2",
+        "stubs/pymssql",
+        "stubs/Routes",
+        "stubs/scribe",
+        "stubs/tornado",
+        // Modules that are incomplete in some way.
         "stdlib/sqlite3/dbapi2.pyi",
         "stdlib/tkinter",
         "stdlib/xml/dom",
@@ -15,28 +26,20 @@
         "stubs/backports",
         "stubs/backports_abc",
         "stubs/boto",
-        "stubs/chardet",
         "stubs/cryptography",
-        "stubs/dateparser",
         "stubs/docutils",
-        "stubs/fb303",
         "stubs/Flask",
         "stubs/Jinja2",
-        "stubs/kazoo",
         "stubs/Markdown",
         "stubs/paramiko",
         "stubs/protobuf",
-        "stubs/pymssql",
         "stubs/PyMySQL",
         "stubs/python-dateutil",
         "stubs/pyvmomi",
         "stubs/PyYAML",
         "stubs/redis",
         "stubs/requests",
-        "stubs/Routes",
-        "stubs/scribe",
         "stubs/simplejson",
-        "stubs/tornado",
         "stubs/waitress",
         "stubs/Werkzeug"
     ],