diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs
index 7e548b8710024a..c9a7a087034f0f 100644
--- a/src/accountant_skel.rs
+++ b/src/accountant_skel.rs
@@ -18,7 +18,6 @@ use result::Result;
 use serde_json;
 use signature::PublicKey;
 use std::cmp::max;
-use std::collections::LinkedList;
 use std::collections::VecDeque;
 use std::io::{Cursor, Write};
 use std::mem::size_of;
@@ -113,15 +112,10 @@ impl AccountantSkel {
             "{}",
             serde_json::to_string(&entry).unwrap()
         ).unwrap();
-        trace!("notify_entry_info entry");
         Self::notify_entry_info_subscribers(obj, &entry);
-        trace!("notify_entry_info done");
     }
 
-    fn receive_all<W: Write>(
-        obj: &SharedSkel,
-        writer: &Arc<Mutex<W>>,
-    ) -> Result<Vec<Entry>> {
+    fn receive_all<W: Write>(obj: &SharedSkel, writer: &Arc<Mutex<W>>) -> Result<Vec<Entry>> {
         //TODO implement a serialize for channel that does this without allocations
         let mut l = vec![];
         let entry = obj.historian
@@ -129,16 +123,11 @@ impl AccountantSkel {
             .lock()
             .unwrap()
             .recv_timeout(Duration::new(1, 0))?;
-        trace!("obj.write 1 {:?}", entry);
         Self::update_entry(obj, writer, &entry);
-        trace!("obj.write 1.end");
         l.push(entry);
         while let Ok(entry) = obj.historian.receive() {
-            trace!("obj.write 2");
             Self::update_entry(obj, writer, &entry);
-            trace!("obj.write 2.end");
             l.push(entry);
-            trace!("num: {}", num);
         }
         Ok(l)
     }
@@ -153,14 +142,13 @@ impl AccountantSkel {
         exit: Arc<AtomicBool>,
     ) -> Result<()> {
         let mut q = VecDeque::new();
-        trace!("max: {}", max);
         while let Ok(list) = Self::receive_all(&obj, writer) {
             trace!("New blobs? {}", list.len());
             let mut start = 0;
             let mut end = 0;
             while start < list.len() {
-                let total = 0;
-                for i in list[start..] {
+                let mut total = 0;
+                for i in &list[start..] {
                     total += size_of::<Event>() * i.events.len();
                     total += size_of::<Entry>();
                     if total >= BLOB_SIZE {
@@ -168,11 +156,15 @@ impl AccountantSkel {
                     }
                     end += 1;
                 }
+                // See that we made progress and a single
+                // vec of Events wasn't too big for a single packet
+                assert!(end > start);
                 let b = blob_recycler.allocate();
                 let pos = {
                     let mut bd = b.write().unwrap();
                     let mut out = Cursor::new(bd.data_mut());
-                    serialize_into(&mut out, &list[start .. end]).expect("failed to serialize output");
+                    serialize_into(&mut out, &list[start..end])
+                        .expect("failed to serialize output");
                     out.position() as usize
                 };
                 assert!(pos < BLOB_SIZE);