diff --git a/mfscommon/dictionary.c b/mfscommon/dictionary.c
index c3476e26..8d5ca4e7 100644
--- a/mfscommon/dictionary.c
+++ b/mfscommon/dictionary.c
@@ -63,229 +63,10 @@ static inline uint32_t GLUE_FN_NAME_PREFIX(_hash)(HASH_ARGS_TYPE_LIST) {
 	return hash;
 }
 
-static inline uint32_t GLUE_FN_NAME_PREFIX(_ehash)(ENTRY_TYPE *e) {
-	return GLUE_FN_NAME_PREFIX(_hash)(e->data,e->leng);
-}
+// GLUE_FN_NAME_PREFIX(_ehash) is needed only if HASH_VALUE_FIELD is not defined !!!
 
 #include "hash_begin.h"
 
-#if 0
-
-#define HASHTAB_LOBITS 20
-#define HASHTAB_HISIZE (0x80000000>>(HASHTAB_LOBITS))
-#define HASHTAB_LOSIZE (1<<HASHTAB_LOBITS)
-#define HASHTAB_MASK (HASHTAB_LOSIZE-1)
-#define HASHTAB_MOVEFACTOR 5
-#define HASHTAB_SIZEHINT 0
-
-
-typedef struct _dictentry {
-	struct _dictentry *next;
-	uint32_t hashval;
-	uint32_t refcnt;
-	uint32_t leng;
-	const uint8_t data[1];
-} dictentry;
-
-static dictentry **dicthashtab[HASHTAB_HISIZE];
-static uint32_t dictrehashpos;
-static uint32_t dicthashsize;
-static uint32_t dicthashelem;
-
-
-/* internals */
-
-static inline uint32_t dict_hash(const uint8_t *data,uint32_t leng) {
-	uint32_t hash,i;
-	hash = leng;
-	for (i=0 ; i<leng ; i++) {
-		hash = hash*33+data[i];
-	}
-	return hash;
-}
-
-static inline uint32_t dict_calc_hash_size(uint32_t elements) {
-	uint32_t res=1;
-	while (elements) {
-		elements>>=1;
-		res<<=1;
-	}
-	if (res==0) {
-		res = UINT32_C(0x80000000);
-	}
-	if (res<HASHTAB_LOSIZE) {
-		return HASHTAB_LOSIZE;
-	}
-	return res;
-}
-
-static inline void dict_hash_init(void) {
-	uint16_t i;
-	dicthashsize = 0;
-	dicthashelem = 0;
-	dictrehashpos = 0;
-	for (i=0 ; i<HASHTAB_HISIZE ; i++) {
-		dicthashtab[i] = NULL;
-	}
-}
-
-static inline void dict_hash_cleanup(void) {
-	uint16_t i;
-	uint32_t j;
-	dicthashelem = 0;
-	dicthashsize = 0;
-	dictrehashpos = 0;
-	for (i=0 ; i<HASHTAB_HISIZE ; i++) {
-		if (dicthashtab[i]!=NULL) {
-			for (j=0 ; j<HASHTAB_LOSIZE ; j++) {
-				massert(dicthashtab[i][j]==NULL,"dictionary has elements during clean up");
-			}
-#ifdef HAVE_MMAP
-			munmap(dicthashtab[i],sizeof(dictentry*)*HASHTAB_LOSIZE);
-#else
-			free(dicthashtab[i]);
-#endif
-		}
-		dicthashtab[i] = NULL;
-	}
-}
-
-static inline void dict_hash_move(void) {
-	uint32_t hash;
-	uint32_t mask;
-	uint32_t moved=0;
-	dictentry **ehptr,**ehptralt,*e;
-	mask = dicthashsize-1;
-	do {
-		if (dictrehashpos>=dicthashsize) { // rehash complete
-			dictrehashpos = dicthashsize;
-			return;
-		}
-		if (dicthashtab[dictrehashpos >> HASHTAB_LOBITS]==NULL) {
-#ifdef HAVE_MMAP
-			dicthashtab[dictrehashpos >> HASHTAB_LOBITS] = mmap(NULL,sizeof(dictentry*)*HASHTAB_LOSIZE,PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,-1,0);
-#else
-			dicthashtab[dictrehashpos >> HASHTAB_LOBITS] = malloc(sizeof(dictentry*)*HASHTAB_LOSIZE);
-#endif
-			passert(dicthashtab[dictrehashpos >> HASHTAB_LOBITS]);
-		}
-		ehptr = dicthashtab[(dictrehashpos - (dicthashsize/2)) >> HASHTAB_LOBITS] + (dictrehashpos & HASHTAB_MASK);
-		ehptralt = dicthashtab[dictrehashpos >> HASHTAB_LOBITS] + (dictrehashpos & HASHTAB_MASK);
-		*ehptralt = NULL;
-		while ((e=*ehptr)!=NULL) {
-			hash = e->hashval & mask;
-			if (hash==dictrehashpos) {
-				*ehptralt = e;
-				*ehptr = e->next;
-				ehptralt = &(e->next);
-				e->next = NULL;
-			} else {
-				ehptr = &(e->next);
-			}
-			moved++;
-		}
-		dictrehashpos++;
-	} while (moved<HASHTAB_MOVEFACTOR);
-}
-
-static inline dictentry* dict_find(const uint8_t *data,uint16_t leng) {
-	dictentry *e;
-	uint32_t hash;
-	uint32_t hashval;
-
-	if (dicthashsize==0) {
-		return NULL;
-	}
-	hashval = dict_hash(data,leng);
-	hash = hashval & (dicthashsize-1);
-	if (dictrehashpos<dicthashsize) {
-		dict_hash_move();
-		if (hash >= dictrehashpos) {
-			hash -= dicthashsize/2;
-		}
-	}
-	for (e=dicthashtab[hash>>HASHTAB_LOBITS][hash&HASHTAB_MASK] ; e ; e=e->next) {
-		if (e->hashval==hashval && e->leng==leng && memcmp((char*)(e->data),(char*)data,leng)==0) {
-			return e;
-		}
-	}
-	return NULL;
-}
-
-static inline void dict_delete(dictentry *e) {
-	dictentry **ehptr,*eit;
-	uint32_t hash;
-
-	if (dicthashsize==0) {
-		return;
-	}
-	hash = (e->hashval) & (dicthashsize-1);
-	if (dictrehashpos<dicthashsize) {
-		dict_hash_move();
-		if (hash >= dictrehashpos) {
-			hash -= dicthashsize/2;
-		}
-	}
-	ehptr = dicthashtab[hash>>HASHTAB_LOBITS] + (hash&HASHTAB_MASK);
-	while ((eit=*ehptr)!=NULL) {
-		if (eit==e) {
-			*ehptr = e->next;
-			dicthashelem--;
-			return;
-		}
-		ehptr = &(eit->next);
-	}
-	uassert("dictionary element not found in data structure");
-}
-
-static inline void dict_add(dictentry *e) {
-	uint16_t i;
-	uint32_t hash;
-
-	if (dicthashsize==0) {
-		dicthashsize = dict_calc_hash_size(HASHTAB_SIZEHINT);
-		dictrehashpos = dicthashsize;
-		dicthashelem = 0;
-		for (i=0 ; i<dicthashsize>>HASHTAB_LOBITS ; i++) {
-#ifdef HAVE_MMAP
-			dicthashtab[i] = mmap(NULL,sizeof(dictentry*)*HASHTAB_LOSIZE,PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,-1,0);
-#else
-			dicthashtab[i] = malloc(sizeof(dictentry*)*HASHTAB_LOSIZE);
-#endif
-			passert(dicthashtab[i]);
-			memset(dicthashtab[i],0,sizeof(dictentry*));
-			if (dicthashtab[i][0]==NULL) {
-				memset(dicthashtab[i],0,sizeof(dictentry*)*HASHTAB_LOSIZE);
-			} else {
-				for (hash=0 ; hash<HASHTAB_LOSIZE ; hash++) {
-					dicthashtab[i][hash] = NULL;
-				}
-			}
-		}
-	}
-	e->hashval = dict_hash(e->data,e->leng);
-	hash = (e->hashval) & (dicthashsize-1);
-	if (dictrehashpos<dicthashsize) {
-		dict_hash_move();
-		if (hash >= dictrehashpos) {
-			hash -= dicthashsize/2;
-		}
-		e->next = dicthashtab[hash>>HASHTAB_LOBITS][hash&HASHTAB_MASK];
-		dicthashtab[hash>>HASHTAB_LOBITS][hash&HASHTAB_MASK] = e;
-		dicthashelem++;
-	} else {
-		e->next = dicthashtab[hash>>HASHTAB_LOBITS][hash&HASHTAB_MASK];
-		dicthashtab[hash>>HASHTAB_LOBITS][hash&HASHTAB_MASK] = e;
-		dicthashelem++;
-		if (dicthashelem>dicthashsize && (dicthashsize>>HASHTAB_LOBITS)<HASHTAB_HISIZE) {
-			dictrehashpos = dicthashsize;
-			dicthashsize *= 2;
-		}
-	}
-}
-
-#endif
-
 /* externals */
 
 int dict_init(void) {
@@ -359,4 +140,3 @@ void dict_inc_ref(void *dptr) {
 #undef HASH_ARGS_TYPE_LIST
 #undef HASH_ARGS_LIST
 #undef GLUE_HASH_TAB_PREFIX
-#undef HASH_VALUE_FIELD
diff --git a/mfscommon/hash_begin.h b/mfscommon/hash_begin.h
index 6556eeda..4729aaaa 100644
--- a/mfscommon/hash_begin.h
+++ b/mfscommon/hash_begin.h
@@ -67,7 +67,7 @@ static inline uint32_t GLUE_FN_NAME_PREFIX(_hash)(HASH_ARGS_TYPE_LIST) {
 }
 
 static inline uint32_t GLUE_FN_NAME_PREFIX(_ehash)(ENTRY_TYPE *e) {
-	return GLUE_FN_NAME_PREFIX(_hash)(e->value);
+	return e->value;
 }
 #endif