Removed defunct update code and fixed event scrolling