Simplify demo2 - Remove dates