diff --git a/VocBase/simple-collection.c b/VocBase/simple-collection.c
index f5487f3dcb..1c0810e228 100644
--- a/VocBase/simple-collection.c
+++ b/VocBase/simple-collection.c
@@ -327,10 +327,6 @@ static TRI_doc_mptr_t CreateDocument (TRI_sim_collection_t* collection,
   // update indexes
   // .............................................................................
 
-  // -----------------------------------------------------------------------------
-  // update indexes
-  // -----------------------------------------------------------------------------
-
   // generate create header
   if (res == TRI_ERROR_NO_ERROR) {
 
@@ -550,10 +546,6 @@ static TRI_doc_mptr_t const UpdateDocument (TRI_sim_collection_t* collection,
   // update indexes
   // .............................................................................
 
-  // -----------------------------------------------------------------------------
-  // update indexes
-  // -----------------------------------------------------------------------------
-
   // update the header
   if (res == TRI_ERROR_NO_ERROR) {
     TRI_doc_mptr_t update;
@@ -943,8 +935,6 @@ static TRI_doc_mptr_t const CreateShapedJson (TRI_doc_collection_t* document,
   TRI_df_marker_t* result;
   TRI_sim_collection_t* collection;
 
-  TRI_set_errno(TRI_ERROR_NO_ERROR);
-
   collection = (TRI_sim_collection_t*) document;
 
   if (type == TRI_DOC_MARKER_DOCUMENT) {
@@ -1037,8 +1027,6 @@ static TRI_doc_mptr_t const UpdateShapedJson (TRI_doc_collection_t* document,
   TRI_doc_mptr_t const* header;
   TRI_sim_collection_t* collection;
 
-  TRI_set_errno(TRI_ERROR_NO_ERROR);
-
   collection = (TRI_sim_collection_t*) document;
 
   // get an existing header pointer
@@ -2184,10 +2172,6 @@ static int UpdateImmediateIndexes (TRI_sim_collection_t* collection,
     return TRI_ERROR_AVOCADO_UNIQUE_CONSTRAINT_VIOLATED;
   }
 
-  if (constraint) {
-    return TRI_VOC_ERROR_UNIQUE_VIOLATED;
-  }
-
   return result;
 }
 
@@ -2872,7 +2856,7 @@ static TRI_index_t* CreateSkiplistIndexSimCollection (TRI_sim_collection_t* coll
   
   if (idx != NULL) {
     TRI_DestroyVector(&paths);
-    TRI_DestroyVectorString(&names);
+    TRI_DestroyVectorPointer(&fields);
 
     LOG_TRACE("skiplist-index already created");
     return idx;
diff --git a/VocBase/vocbase.c b/VocBase/vocbase.c
index e496a969ef..6e9220716e 100644
--- a/VocBase/vocbase.c
+++ b/VocBase/vocbase.c
@@ -474,8 +474,6 @@ TRI_vocbase_t* TRI_OpenVocBase (char const* path) {
     return NULL;
   }
 
-  TRI_FreeString(lockFile);
-
   // setup vocbase structure
   vocbase = TRI_Allocate(sizeof(TRI_vocbase_t));