Removed scroll-related code (moved to @AdrianVasiliu fork).
Fix Tests
Process @wkeese comments