Shaped/Shapeless check

Remove items also