remove Item class
Merge branch 'HH-37909' of github.com:hhru/tortik into HH-37909