cleanup, demo added