SIT-605
fixed npe in the data cleanup