removed unused code
pagination support