Add standard mode for demos
Revert "Add standard mode for demos"

This reverts commit 1f361652072920d33e1bd3cc2d0a0d98e3f0000f.
Add Standard mode for demos