Remove non-functional search and extra paginator