Refactor removing of items