BookCatalog cleanup