Fixed up data cleanup