Cleanup in demo to init. state