Fix for non-cancelable book removal from bookshelves
Merge pull request #6483 from GinjaNinja32/shelf

Fix for non-cancelable book removal from bookshelves