v4.2 clean up my fail implimentation of pagination