fixed scrolls
removed unused code