diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2e121e5be..2b7ff6183 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,12 +9,15 @@ Since last release
 
 **Changed:**
 
+* Rely on ``python3`` in environment instead of ``python`` (#602)
 * Update archetype definitions to use cyclus constants instead of arbitrary hardcoded values (#606)
 
 **Fixed:**
 
 **Removed:**
 
+* Removed references to deprecated ``ResourceBuff`` class (#604)
+
 
 v1.6.0
 ====================
diff --git a/INSTALL.rst b/INSTALL.rst
index 2effce053..d5dc882e8 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -45,7 +45,7 @@ Run the install script:
 
 .. code-block:: bash
   
-  python install.py
+  python3 install.py
 
 
 If you successfully followed the instructions above, then the Cycamore library
@@ -130,7 +130,7 @@ installation flag. The otherwise identical process would look like:
 
 .. code-block:: bash
 
-    .../cycamore$  python install.py --coin_root=path/to/coin
+    .../cycamore$  python3 install.py --coin_root=path/to/coin
 
 
 CMake Cycamore Installation
diff --git a/install.py b/install.py
index 1809c8954..6763059e2 100755
--- a/install.py
+++ b/install.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 from __future__ import print_function, unicode_literals
 import os
 import sys
diff --git a/src/storage.cc b/src/storage.cc
index e71eca8f3..1cd893741 100644
--- a/src/storage.cc
+++ b/src/storage.cc
@@ -42,8 +42,7 @@ void Storage::InitFrom(Storage* m) {
 void Storage::InitFrom(cyclus::QueryableBackend* b) {
 #pragma cyclus impl initfromdb cycamore::Storage
 
-  using cyclus::toolkit::Commodity;
-  Commodity commod = Commodity(out_commods.front());
+  cyclus::toolkit::Commodity commod = cyclus::toolkit::Commodity(out_commods.front());
   cyclus::toolkit::CommodityProducer::Add(commod);
   cyclus::toolkit::CommodityProducer::SetCapacity(commod, throughput);
 }
@@ -244,7 +243,6 @@ void Storage::Tick() {
 
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Storage::Tock() {
-  using cyclus::toolkit::RecordTimeSeries;
   LOG(cyclus::LEV_INFO3, "ComCnv") << prototype() << " is tocking {";
 
   BeginProcessing_();  // place unprocessed inventory into processing
@@ -318,11 +316,6 @@ void Storage::BeginProcessing_() {
 
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Storage::ProcessMat_(double cap) {
-  using cyclus::Material;
-  using cyclus::ResCast;
-  using cyclus::toolkit::ResBuf;
-  using cyclus::toolkit::Manifest;
-
   if (!ready.empty()) {
     try {
       double max_pop = std::min(cap, ready.quantity());
@@ -354,7 +347,6 @@ void Storage::ProcessMat_(double cap) {
 
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Storage::ReadyMatl_(int time) {
-  using cyclus::toolkit::ResBuf;
   LOG(cyclus::LEV_INFO5, "ComCnv") << "Placing material into ready";
 
   int to_ready = 0;
diff --git a/tests/README.rst b/tests/README.rst
index c63e89fab..e7b52207c 100644
--- a/tests/README.rst
+++ b/tests/README.rst
@@ -37,7 +37,7 @@ Next, generate the new databases:
 
 .. code-block:: bash
 
-  $ python ref.py gen
+  $ python3 ref.py gen
 
 Next, rename the databases:
 
@@ -93,4 +93,4 @@ those tables. See the module's help:
 
 .. code-block:: python
 
-  $ python analysis.py -h
+  $ python3 analysis.py -h
diff --git a/tests/run_inputs.py.in b/tests/run_inputs.py.in
index ae1c42a40..e897246cd 100644
--- a/tests/run_inputs.py.in
+++ b/tests/run_inputs.py.in
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import subprocess
diff --git a/tests/test_regression.py b/tests/test_regression.py
index 9f7aab0fb..9fded61ee 100644
--- a/tests/test_regression.py
+++ b/tests/test_regression.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 import os
 import uuid
 import sqlite3