Remove skrollr, fix underscore bug