cleanup for data issues