diff --git a/src/api3/admin/datastore.rs b/src/api3/admin/datastore.rs
index 175a9b8b..fc8a6c34 100644
--- a/src/api3/admin/datastore.rs
+++ b/src/api3/admin/datastore.rs
@@ -2,11 +2,11 @@ use failure::*;
 
 use crate::api::schema::*;
 use crate::api::router::*;
-use crate::server::rest::*;
+//use crate::server::rest::*;
 use serde_json::{json, Value};
 
-use hyper::StatusCode;
-use hyper::rt::{Future, Stream};
+//use hyper::StatusCode;
+//use hyper::rt::{Future, Stream};
 
 use crate::config::datastore;
 
diff --git a/src/api3/admin/datastore/upload_catar.rs b/src/api3/admin/datastore/upload_catar.rs
index 0b8422c1..668aa59a 100644
--- a/src/api3/admin/datastore/upload_catar.rs
+++ b/src/api3/admin/datastore/upload_catar.rs
@@ -2,13 +2,12 @@ use failure::*;
 
 use crate::backup::datastore::*;
 use crate::backup::archive_index::*;
-use crate::server::rest::*;
+//use crate::server::rest::*;
 use crate::api::schema::*;
 use crate::api::router::*;
 
-use serde_json::{json, Value};
-
-use std::sync::Arc;
+use serde_json::Value;
+use std::io::Write;
 use futures::*;
 
 pub struct UploadCaTar {
@@ -23,20 +22,16 @@ impl Future for UploadCaTar {
 
     fn poll(&mut self) -> Poll<(), failure::Error> {
         loop {
-            use std::io::Write;
-
             match try_ready!(self.stream.poll()) {
                 Some(chunk) => {
                     self.count += chunk.len();
-                    println!("UPLOAD Chunk {} {}", chunk.len(), self.count);
                     if let Err(err) = self.index.write(&chunk) {
                         bail!("writing chunk failed - {}", err);
                     }
                     return Ok(Async::NotReady);
                 }
                 None => {
-                    println!("UPLOAD Close Index {}", self.count);
-                    self.index.close();
+                    self.index.close()?;
                     return Ok(Async::Ready(()))
                 }
             }
@@ -48,18 +43,16 @@ fn upload_catar(req_body: hyper::Body, param: Value, _info: &ApiUploadMethod) ->
 
     let store = param["name"].as_str().unwrap();
 
-    use std::io::Write;
-
     println!("Upload .catar to {}", store);
 
     let chunk_size = 4*1024*1024;
     let datastore = DataStore::lookup_datastore(store).unwrap().clone();
 
-    let mut index = datastore.create_archive_writer("upload.aidx", chunk_size).unwrap();
+    let index = datastore.create_archive_writer("upload.aidx", chunk_size).unwrap();
 
     let upload = UploadCaTar { stream: req_body, index, count: 0};
 
-    let resp = upload.and_then(|v| {
+    let resp = upload.and_then(|_| {
 
         let response = http::Response::builder()
             .status(200)