Fix scroll and remove unused code