Code cleanup and scroll content fetch change.

Cleaned unused/commented out code.
For the scroll part , scroll will now fetch one result per scroll.