diff --git a/juci/selectiondialog.cc b/juci/selectiondialog.cc
index c96d7c7..02a2c4c 100644
--- a/juci/selectiondialog.cc
+++ b/juci/selectiondialog.cc
@@ -1,9 +1,6 @@
 #include "selectiondialog.h"
-#include <regex>
 
-SelectionDialog::SelectionDialog(Gtk::TextView& text_view): text_view(text_view) {
-  
-}
+SelectionDialog::SelectionDialog(Gtk::TextView& text_view): text_view(text_view) {}
 
 void SelectionDialog::show() {
   if(rows.size()==0)
diff --git a/juci/source.cc b/juci/source.cc
index c44c44c..4de235f 100644
--- a/juci/source.cc
+++ b/juci/source.cc
@@ -300,15 +300,8 @@ get_autocomplete_suggestions(int line_number, int column, std::map<std::string,
                                      column-1);
   for (int i = 0; i < results.size(); i++) {
     auto result=results.get(i);
-    const vector<clang::CompletionChunk> chunks_ = result.get_chunks();
-    if(chunks_.size()>0) {
-      std::vector<AutoCompleteChunk> chunks;
-      for (auto &chunk : chunks_) {
-        chunks.emplace_back(chunk);
-      }
-      suggestions.emplace_back(chunks);
-      suggestions.back().brief_comments=result.get_brief_comments();
-    }
+    suggestions.emplace_back(result.get_chunks());
+    suggestions.back().brief_comments=result.get_brief_comments();
   }
   DEBUG("Number of suggestions");
   DEBUG_VAR(suggestions.size());
diff --git a/juci/source.h b/juci/source.h
index f9aab45..2f9182b 100644
--- a/juci/source.h
+++ b/juci/source.h
@@ -43,19 +43,11 @@ namespace Source {
     int kind;
   };
 
-  class AutoCompleteChunk {
-  public:
-    explicit AutoCompleteChunk(const clang::CompletionChunk &clang_chunk) :
-      chunk(clang_chunk.chunk()), kind(clang_chunk.kind()) { }
-    std::string chunk;
-    enum clang::CompletionChunkKind kind;
-  };
-
   class AutoCompleteData {
   public:
-    explicit AutoCompleteData(const std::vector<AutoCompleteChunk> &chunks) :
+    explicit AutoCompleteData(const std::vector<clang::CompletionChunk> &chunks) :
       chunks(chunks) { }
-    std::vector<AutoCompleteChunk> chunks;
+    std::vector<clang::CompletionChunk> chunks;
     std::string brief_comments;
   };