Fix 'next page' loading on entry pages, remove superflous code.