diff --git a/.gitignore b/.gitignore
index f32e86fc..ffa5f98e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ build
 dist
 docs/build
 .tox/
+.cache/
+*~
diff --git a/pandas_datareader/_utils.py b/pandas_datareader/_utils.py
index ddcdb88b..914028cc 100644
--- a/pandas_datareader/_utils.py
+++ b/pandas_datareader/_utils.py
@@ -2,7 +2,6 @@
 from distutils.version import LooseVersion
 
 import pandas as pd
-from pandas.core.common import PandasError
 from pandas import to_datetime
 
 import requests
@@ -45,7 +44,7 @@ class SymbolWarning(UserWarning):
     pass
 
 
-class RemoteDataError(PandasError, IOError):
+class RemoteDataError(IOError):
     pass
 
 
diff --git a/pandas_datareader/edgar.py b/pandas_datareader/edgar.py
index 75597208..219a66b2 100644
--- a/pandas_datareader/edgar.py
+++ b/pandas_datareader/edgar.py
@@ -6,9 +6,9 @@
 from pandas import read_csv
 from pandas import DataFrame
 from pandas import to_datetime
-from pandas.io.common import ZipFile
+from zipfile import ZipFile
 from pandas.compat import StringIO
-from pandas.core.common import is_number
+from pandas.api.types import is_number
 
 from pandas_datareader.base import _BaseReader
 from pandas_datareader.compat import BytesIO
diff --git a/pandas_datareader/famafrench.py b/pandas_datareader/famafrench.py
index b4dd60e7..d0a4b5da 100644
--- a/pandas_datareader/famafrench.py
+++ b/pandas_datareader/famafrench.py
@@ -1,7 +1,7 @@
 import tempfile
 import re
 import datetime as dt
-from pandas.io.common import ZipFile
+from zipfile import ZipFile
 from pandas.compat import lmap, StringIO
 from pandas import read_csv, to_datetime