Removed more pagination aspects