Removes old paginator implementation
Updates to use newer form interface