BOOK-872 + BOOK-901
Quick removal of unused code.
Merge pull request #1061 from onepercentclub/feature/BOOK-872

BOOK-872 + BOOK-901