Clean up demo stuff