fix for scrolling with infinite scrolling
fixes scrolling animation issues
Merge branch 'feature/fix_for_infinite_scrolling' into develop
removed unused code