Remove pagination until its working