Remove erroneous mkws-template_underscore and fix demos. MKWS-294