CVJ-118 remove pagination