Remove unused method
Fix paginator