remove unused diffitem file
Fix usage of heapitems
Fix compilation behaviour after refactor
Fix more compilation errors
Fix more errors