LPS-49532 Paginator issues & unused code