Remove ChapterSource and use ChapterPageSource only