Refactoring and removal of specific item classes