diff --git a/diffsims/__init__.py b/diffsims/__init__.py
index a81342b4..68b95055 100644
--- a/diffsims/__init__.py
+++ b/diffsims/__init__.py
@@ -29,20 +29,3 @@
 from .sims.diffraction_simulation import DiffractionSimulation
 
 _logger = logging.getLogger(__name__)
-
-
-def load(filename):
-    """
-    An extremely thin wrapper around hyperspy's load function
-
-    Parameters
-    ----------
-    filename : str
-        A single filename of a previously saved diffsims object. Other arguments may
-        succeed, but will have fallen back on hyperspy load and warn accordingly
-    *args :
-        args to be passed to hyperspy's load function
-    **kwargs :
-        kwargs to be passed to hyperspy's load function
-    """
-    pass
diff --git a/diffsims/generators/diffraction_generator.py b/diffsims/generators/diffraction_generator.py
index 7e7cdb28..a4e41226 100644
--- a/diffsims/generators/diffraction_generator.py
+++ b/diffsims/generators/diffraction_generator.py
@@ -173,7 +173,7 @@ def calculate_profile_data(self, structure,
 
         Returns
         -------
-        pyxem.ProfileSimulation
+        diffsims.ProfileSimulation
             The diffraction profile corresponding to this structure and
             experimental conditions.
         """
diff --git a/diffsims/tests/test_generators/test_diffraction_generator.py b/diffsims/tests/test_generators/test_diffraction_generator.py
index 49ea3e16..44d753f5 100644
--- a/diffsims/tests/test_generators/test_diffraction_generator.py
+++ b/diffsims/tests/test_generators/test_diffraction_generator.py
@@ -126,4 +126,4 @@ def test_param_check(scattering_param):
 def test_invalid_scattering_params():
     scattering_param = '_empty'
     generator = DiffractionGenerator(300, 0.2, None,
-scattering_params=scattering_param)
+                                     scattering_params=scattering_param)
diff --git a/diffsims/tests/test_sims/test_diffraction_simulation.py b/diffsims/tests/test_sims/test_diffraction_simulation.py
index 20126528..87a8eca6 100644
--- a/diffsims/tests/test_sims/test_diffraction_simulation.py
+++ b/diffsims/tests/test_sims/test_diffraction_simulation.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
-# Copyright 2017-2019 The pyXem developers
+# Copyright 2017-2019 The diffsims developers
 #
-# This file is part of pyXem.
+# This file is part of diffsims.
 #
-# pyXem is free software: you can redistribute it and/or modify
+# diffsims is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# pyXem is distributed in the hope that it will be useful,
+# diffsims is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with pyXem.  If not, see <http://www.gnu.org/licenses/>.
+# along with diffsims.  If not, see <http://www.gnu.org/licenses/>.
 
 import numpy as np
 import pytest
diff --git a/diffsims/tests/test_utils/test_vector_utils.py b/diffsims/tests/test_utils/test_vector_utils.py
index 14ad3409..7e3de90b 100644
--- a/diffsims/tests/test_utils/test_vector_utils.py
+++ b/diffsims/tests/test_utils/test_vector_utils.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
-# Copyright 2019 The pyXem developers
+# Copyright 2019 The diffsims developers
 #
-# This file is part of pyXem.
+# This file is part of diffsims.
 #
-# pyXem is free software: you can redistribute it and/or modify
+# diffsims is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# pyXem is distributed in the hope that it will be useful,
+# diffsims is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with pyXem.  If not, see <http://www.gnu.org/licenses/>.
+# along with diffsims.  If not, see <http://www.gnu.org/licenses/>.
 
 import numpy as np
 import pytest
diff --git a/package-list-linux.txt b/package-list-linux.txt
deleted file mode 100644
index e8505ed0..00000000
--- a/package-list-linux.txt
+++ /dev/null
@@ -1,170 +0,0 @@
-# This file may be used to create an environment using:
-# Details and usage can be seen at https://github.com/pyxem/pyxem/pull/397, commit 40a4f06 gives the main idea.
-# $ conda create --name <env> --file <this file>
-# platform: linux-64
-asn1crypto=0.24.0=py37_0
-atomicwrites=1.3.0=py37_1
-attrs=19.1.0=py37_1
-backcall=0.1.0=py37_0
-blas=1.0=mkl
-bleach=3.1.0=py37_0
-bokeh=1.1.0=py37_0
-ca-certificates=2019.1.23=0
-certifi=2019.3.9=py37_0
-cffi=1.12.3=py37h2e261b9_0
-chardet=3.0.4=py37_1
-click=7.0=py37_0
-cloudpickle=0.8.1=py_0
-coverage=4.5.3=py37h7b6447c_0
-coveralls=1.7.0=py_0
-cryptography=2.6.1=py37h1ba5d50_0
-cycler=0.10.0=py37_0
-cytoolz=0.9.0.1=py37h14c3975_1
-dask=1.2.0=py_0
-dask-core=1.2.0=py_0
-dbus=1.13.6=h746ee38_0
-decorator=4.4.0=py37_1
-defusedxml=0.6.0=py_0
-diffpy.structure=3.0.0=py_0
-dill=0.2.9=py37_0
-distributed=1.27.1=py37_0
-docopt=0.6.2=py37_0
-entrypoints=0.3=py37_0
-expat=2.2.6=he6710b0_0
-fastcache=1.0.2=py37h14c3975_2
-fontconfig=2.13.0=h9420a91_0
-freetype=2.9.1=h8a8886c_1
-glib=2.56.2=hd408876_0
-gmp=6.1.2=h6c8ec71_1
-gmpy2=2.0.8=py37h10f8cd9_2
-gst-plugins-base=1.14.0=hbbd80ab_1
-gstreamer=1.14.0=hb453b48_1
-h5py=2.9.0=py37h7918eee_0
-hdf5=1.10.4=hb1b8bf9_0
-heapdict=1.0.0=py37_2
-icu=58.2=h9c2bf20_1
-idna=2.8=py37_0
-imageio=2.5.0=py37_0
-intel-openmp=2019.3=199
-ipykernel=5.1.0=py37h39e3cac_0
-ipyparallel=6.2.3=py37_0
-ipython=7.5.0=py37h39e3cac_0
-ipython_genutils=0.2.0=py37_0
-ipywidgets=7.4.2=py37_0
-jedi=0.13.3=py37_0
-jinja2=2.10.1=py37_0
-jpeg=9b=h024ee3a_2
-jsonschema=3.0.1=py37_0
-jupyter=1.0.0=py37_7
-jupyter_client=5.2.4=py37_0
-jupyter_console=6.0.0=py37_0
-jupyter_core=4.4.0=py37_0
-kiwisolver=1.1.0=py37he6710b0_0
-libedit=3.1.20181209=hc058e9b_0
-libffi=3.2.1=hd88cf55_4
-libgcc-ng=8.2.0=hdf63c60_1
-libgfortran-ng=7.3.0=hdf63c60_0
-libpng=1.6.37=hbc83047_0
-libsodium=1.0.16=h1bed415_0
-libstdcxx-ng=8.2.0=hdf63c60_1
-libtiff=4.0.10=h2733197_2
-libuuid=1.0.3=h1bed415_2
-libxcb=1.13=h1bed415_1
-libxml2=2.9.9=he19cac6_0
-llvmlite=0.28.0=py37hd408876_0
-locket=0.2.0=py37_1
-markupsafe=1.1.1=py37h7b6447c_0
-matplotlib=3.0.3=py37h5429711_0
-mistune=0.8.4=py37h7b6447c_0
-mkl=2019.3=199
-mkl_fft=1.0.12=py37ha843d7b_0
-mkl_random=1.0.2=py37hd81dba3_0
-more-itertools=7.0.0=py37_0
-mpc=1.1.0=h10f8cd9_1
-mpfr=4.0.1=hdf1c602_3
-mpmath=1.1.0=py37_0
-msgpack-python=0.6.1=py37hfd86e86_1
-natsort=6.0.0=py_0
-nbconvert=5.5.0=py_0
-nbformat=4.4.0=py37_0
-ncurses=6.1=he6710b0_1
-networkx=2.3=py_0
-notebook=5.7.8=py37_0
-numba=0.43.1=py37h962f231_0
-numexpr=2.6.9=py37h9e4a6bb_0
-numpy=1.16.3=py37h7e9f1db_0
-numpy-base=1.16.3=py37hde5b4d6_0
-olefile=0.46=py37_0
-openssl=1.1.1b=h7b6447c_1
-packaging=19.0=py37_0
-pandas=0.24.2=py37he6710b0_0
-pandoc=2.2.3.2=0
-pandocfilters=1.4.2=py37_1
-parso=0.4.0=py_0
-partd=0.3.10=py37_1
-patsy=0.5.1=py37_0
-pcre=8.43=he6710b0_0
-pexpect=4.7.0=py37_0
-pickleshare=0.7.5=py37_0
-pillow=6.0.0=py37h34e0f95_0
-pint=0.9=py37_2
-pip=19.1=py37_0
-pluggy=0.9.0=py37_0
-prometheus_client=0.6.0=py37_0
-prompt_toolkit=2.0.9=py37_0
-psutil=5.6.2=py37h7b6447c_0
-ptyprocess=0.6.0=py37_0
-py=1.8.0=py37_0
-pycifrw=4.4.1=py37h14c3975_0
-pycparser=2.19=py37_0
-pygments=2.3.1=py37_0
-pyopenssl=19.0.0=py37_0
-pyparsing=2.4.0=py_0
-pyqt=5.9.2=py37h05f1152_2
-pyrsistent=0.14.11=py37h7b6447c_0
-pysocks=1.6.8=py37_0
-pytest=4.4.1=py37_0
-pytest-cov=2.6.1=py37_0
-python=3.7.3=h0371630_0
-python-dateutil=2.8.0=py37_0
-pytz=2019.1=py_0
-pywavelets=1.0.3=py37hdd07704_1
-pyyaml=5.1=py37h7b6447c_0
-pyzmq=18.0.0=py37he6710b0_0
-qt=5.9.7=h5867ecd_1
-qtconsole=4.4.3=py37_0
-readline=7.0=h7b6447c_5
-requests=2.21.0=py37_0
-scikit-image=0.15.0=py37he6710b0_0
-scikit-learn=0.20.3=py37hd81dba3_0
-scipy=1.2.1=py37h7c811a0_0
-send2trash=1.5.0=py37_0
-setuptools=41.0.1=py37_0
-sip=4.19.8=py37hf484d3e_0
-six=1.12.0=py37_0
-sortedcontainers=2.1.0=py37_0
-sparse=0.7.0=py_0
-sqlite=3.28.0=h7b6447c_0
-statsmodels=0.9.0=py37h035aef0_0
-sympy=1.4=py37_0
-tblib=1.3.2=py37_0
-terminado=0.8.2=py37_0
-testpath=0.4.2=py37_0
-tk=8.6.8=hbc83047_0
-toolz=0.9.0=py37_0
-tornado=6.0.2=py37h7b6447c_0
-tqdm=4.31.1=py37_1
-traitlets=4.3.2=py37_0
-traits=5.1.1=py37h7b6447c_0
-transforms3d=0.3.1=py_0
-urllib3=1.24.2=py37_0
-wcwidth=0.1.7=py37_0
-webencodings=0.5.1=py37_1
-wheel=0.33.1=py37_0
-widgetsnbextension=3.4.2=py37_0
-xz=5.2.4=h14c3975_4
-yaml=0.1.7=had09818_2
-zeromq=4.3.1=he6710b0_3
-zict=0.1.4=py37_0
-zlib=1.2.11=h7b6447c_3
-zstd=1.3.7=h0b5b093_0
diff --git a/setup.py b/setup.py
index 5fbfeb12..7bdfac3e 100644
--- a/setup.py
+++ b/setup.py
@@ -46,8 +46,8 @@
     packages=find_packages(),
     # adjust the tabbing
     install_requires=[
-        'scikit-image == 0.15.0',  # See pyxem/pull/378
-        'matplotlib < 3.1.0',  # See pyxem/pull/403
+        'scikit-image == 0.15.0',
+        'matplotlib < 3.1.0',
         'transforms3d',
         'diffpy.structure >= 3.0.0'  # First Python 3 support
     ],