Fixed the clearing of data issues (hopefully).