diff --git a/imag-store/Cargo.toml b/imag-store/Cargo.toml
index 07d531b4..cadd37d0 100644
--- a/imag-store/Cargo.toml
+++ b/imag-store/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Matthias Beyer <mail@beyermatthias.de>"]
 
 [dependencies]
-clap = "1.5.5"
+clap = "2.1.1"
 log = "0.3.5"
 version = "2.0.1"
 semver = "0.2.1"
diff --git a/imag-store/src/ui.rs b/imag-store/src/ui.rs
index da8886f7..59dfbcaf 100644
--- a/imag-store/src/ui.rs
+++ b/imag-store/src/ui.rs
@@ -1,6 +1,6 @@
 use clap::{Arg, App, SubCommand};
 
-pub fn build_ui<'a>(app: App<'a, 'a, 'a, 'a, 'a, 'a>) -> App<'a, 'a, 'a, 'a, 'a, 'a> {
+pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
     app.subcommand(SubCommand::with_name("create")
                    .about("Create an entry from the store")
                    .version("0.1")
diff --git a/imag-store/src/util.rs b/imag-store/src/util.rs
index 987ab4f3..9fb01720 100644
--- a/imag-store/src/util.rs
+++ b/imag-store/src/util.rs
@@ -44,7 +44,6 @@ pub fn build_toml_header(matches: &ArgMatches, mut header: EntryHeader) -> Entry
     debug!("Building header from cli spec");
     if let Some(headerspecs) = matches.values_of("header") {
         let mut main = header.into();
-        debug!("headerspec = {:?}", headerspecs);
         let kvs = headerspecs.into_iter()
                             .filter_map(|hs| {
                                 debug!("- Processing: '{}'", hs);