remove redundant scoping on demo