Remove old scroll handling