diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 2b54546f..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "mantid_total_scattering"]
-	path = addie/reduction/mantid_total_scattering
-	url = https://github.com/marshallmcdonnell/mantid_total_scattering.git
diff --git a/README.md b/README.md
index 0035f9a8..eacf15d4 100644
--- a/README.md
+++ b/README.md
@@ -54,15 +54,7 @@ addie that way as well. After creating the virtual environment, run
 ```
 
 which will add a file, `mantid.pth` to your environment with the
-location of mantid. Then you need to "develop" mantid_total_scattering
-
-```bash
-cd mantid_total_scattering
-python setup.py develop
-cd -
-```
-
-and finally the the normal
+location of mantid. Then you need to setup for development: 
 
 ```bash
 python setup.py develop
@@ -79,6 +71,14 @@ layout python2 -- --system-site-packages
 ```
 so the system wide packages installed for mantid are found.
 
+or with `pipenv` (which will use Pipfile), first setup the directory and then add the `.envrc` file:
+```
+cd addie
+pipenv --two
+echo layout_pipenv > .envrc
+direnv allow
+```
+
 Creating RPMs
 -------------
 
diff --git a/addiedevel.sh b/addiedevel.sh
index 3cb9d6c1..ad4fd471 100755
--- a/addiedevel.sh
+++ b/addiedevel.sh
@@ -26,10 +26,6 @@ fi
 PYTHON_VERSION=$($RAW_PYTHON -c 'import sys; version=sys.version_info[:3]; print("{0}.{1}".format(*version))')
 echo using $RAW_PYTHON version $PYTHON_VERSION
 
-# build mantid_total_scattering
-cd addie/reduction/mantid_total_scattering
-$CMD setup.py build
-cd -
 # build addie
 $CMD setup.py build
 
diff --git a/setup.cfg b/setup.cfg
index 7c3710f0..7c15fde2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,7 +12,7 @@ doc_files = README.md
 
 [flake8]
 ignore = E114,E115,E116,E121,E123,E126,E133,E2,E704,E722,E741,E743,W503,F403,F405,F999
-exclude = addie/icons/icons_rc.py,versioneer.py,mantid_total_scattering
+exclude = addie/icons/icons_rc.py,versioneer.py
 doctests = True
 max-line-length = 130
 
diff --git a/update_submodule.sh b/update_submodule.sh
deleted file mode 100755
index 75b4497d..00000000
--- a/update_submodule.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-# For the first time, use this
-#git submodule update --init --recursive
-
-# To pull the last commit on all submodules
-git submodule foreach git pull origin master