BOOK-509 remove comments