remove 2nd paginator
add comment admin and remove unused code