implemented limitations on Remove Shelf functionality