diff --git a/MANIFEST.in b/MANIFEST.in
index 0b2d2c7..1138cd7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,7 @@ include README.rst
 include CHANGES.rst
 include LICENSE.rst
 
-include ah_bootstrap.py
+include pyproject.toml
 include setup.cfg
 include astrowidgets/tests/coveragerc
 
@@ -14,25 +14,6 @@ prune build
 prune docs/_build
 prune docs/api
 
-# the next few stanzas are for astropy_helpers.  It's derived from the
-# astropy_helpers/MANIFEST.in, but requires additional includes for the actual
-# package directory and egg-info.
-
-include astropy_helpers/README.rst
-include astropy_helpers/CHANGES.rst
-include astropy_helpers/LICENSE.rst
-recursive-include astropy_helpers/licenses *
-
-include astropy_helpers/ah_bootstrap.py
-
-recursive-include astropy_helpers/astropy_helpers *.py *.pyx *.c *.h *.rst
-recursive-include astropy_helpers/astropy_helpers.egg-info *
-# include the sphinx stuff with "*" because there are css/html/rst/etc.
-recursive-include astropy_helpers/astropy_helpers/sphinx *
-
-prune astropy_helpers/build
-prune astropy_helpers/astropy_helpers/tests
-
 # Miscellaneous
 
 global-exclude *.pyc *.o
diff --git a/docs/conf.py b/docs/conf.py
index 99860f6..c256e94 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -36,10 +36,7 @@
     sys.exit(1)
 
 # Get configuration information from setup.cfg
-try:
-    from ConfigParser import ConfigParser
-except ImportError:
-    from configparser import ConfigParser
+from configparser import ConfigParser
 conf = ConfigParser()
 
 conf.read([os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')])