- adding ItemKey impl + clean up dead code