From 0be715c0c10315624e73f16a8ace29b5bf850ef5 Mon Sep 17 00:00:00 2001
From: Ben Nibbelink <bnibbs@vt.edu>
Date: Thu, 16 May 2024 20:19:55 -0500
Subject: [PATCH 1/3] remove reference to Manifest

---
 src/storage.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/storage.cc b/src/storage.cc
index 276326388..b02d49589 100644
--- a/src/storage.cc
+++ b/src/storage.cc
@@ -318,7 +318,6 @@ void Storage::ProcessMat_(double cap) {
   using cyclus::Material;
   using cyclus::ResCast;
   using cyclus::toolkit::ResBuf;
-  using cyclus::toolkit::Manifest;
 
   if (!ready.empty()) {
     try {

From cfbaba14153856678242ca220e0e1154e7a564c2 Mon Sep 17 00:00:00 2001
From: Ben Nibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Thu, 16 May 2024 21:51:44 -0500
Subject: [PATCH 2/3] Update CHANGELOG.rst

---
 CHANGELOG.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c64cea94d..989d8e73f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,12 +9,14 @@ Since last release
 
 **Changed:**
 
-* Rely on `python3` in environment instead of `python` (#602)
+* Rely on ``python3`` in environment instead of ``python`` (#602)
 
 **Fixed:**
 
 **Removed:**
 
+* Removed references to deprecated ``ResourceBuff`` class (#604)
+
 
 v1.6.0
 ====================

From 72ccbaba0bd401d66f3f6dcc744f91758619ce04 Mon Sep 17 00:00:00 2001
From: Ben Nibbelink <bnibbs@vt.edu>
Date: Fri, 17 May 2024 12:12:20 -0500
Subject: [PATCH 3/3] clean up using cyclus:: statements

---
 src/storage.cc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/storage.cc b/src/storage.cc
index b02d49589..96487b44c 100644
--- a/src/storage.cc
+++ b/src/storage.cc
@@ -41,8 +41,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);
 }
@@ -241,7 +240,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
@@ -315,10 +313,6 @@ void Storage::BeginProcessing_() {
 
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Storage::ProcessMat_(double cap) {
-  using cyclus::Material;
-  using cyclus::ResCast;
-  using cyclus::toolkit::ResBuf;
-
   if (!ready.empty()) {
     try {
       double max_pop = std::min(cap, ready.quantity());
@@ -350,7 +344,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;