Demo app cleanup