Lean up demo some more