remove cruft; add canvas arg to requestAnimFrame