Simplify demo even more