remove old code
fix pager