Clean-up line and marker demos
Merge pull request #2788 from tonysyu/mep12-lines-and-markers-demo

MEP12: Clean-up line and marker demos