User modern syntax.
Remove unused timer from demo.