cleanup and start introducing infinity scrolling