[FIX] Removed old paginator