Remove the data cleanup stuff