Fixed issue: Removed dublicated itemtype
Fixed issue: Minor cleanup