further data cleanup