Added remove step to resetting data for better demo compatibility.