Remove some namespacing in demos that is no longer required.