Refactor of unused items.